2004-01-29 02:37:52 -04:00
|
|
|
#include "Python.h"
|
2004-05-30 04:26:47 -03:00
|
|
|
#include "structmember.h"
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
/* collections module implementation of a deque() datatype
|
|
|
|
Written and maintained by Raymond D. Hettinger <python@rcn.com>
|
|
|
|
Copyright (c) 2004 Python Software Foundation.
|
|
|
|
All rights reserved.
|
|
|
|
*/
|
|
|
|
|
2004-10-01 12:25:53 -03:00
|
|
|
/* The block length may be set to any number over 1. Larger numbers
|
|
|
|
* reduce the number of calls to the memory allocator but take more
|
|
|
|
* memory. Ideally, BLOCKLEN should be set with an eye to the
|
2006-07-27 21:23:15 -03:00
|
|
|
* length of a cache line.
|
2004-10-01 12:25:53 -03:00
|
|
|
*/
|
|
|
|
|
2004-11-01 22:11:35 -04:00
|
|
|
#define BLOCKLEN 62
|
2004-10-01 03:24:12 -03:00
|
|
|
#define CENTER ((BLOCKLEN - 1) / 2)
|
2004-01-29 02:37:52 -04:00
|
|
|
|
2004-09-30 22:32:53 -03:00
|
|
|
/* A `dequeobject` is composed of a doubly-linked list of `block` nodes.
|
|
|
|
* This list is not circular (the leftmost block has leftlink==NULL,
|
|
|
|
* and the rightmost block has rightlink==NULL). A deque d's first
|
|
|
|
* element is at d.leftblock[leftindex] and its last element is at
|
|
|
|
* d.rightblock[rightindex]; note that, unlike as for Python slice
|
2004-10-01 03:24:12 -03:00
|
|
|
* indices, these indices are inclusive on both ends. By being inclusive
|
2006-07-27 21:23:15 -03:00
|
|
|
* on both ends, algorithms for left and right operations become
|
2004-10-01 03:24:12 -03:00
|
|
|
* symmetrical which simplifies the design.
|
2006-07-27 21:23:15 -03:00
|
|
|
*
|
2004-10-01 03:24:12 -03:00
|
|
|
* The list of blocks is never empty, so d.leftblock and d.rightblock
|
|
|
|
* are never equal to NULL.
|
|
|
|
*
|
|
|
|
* The indices, d.leftindex and d.rightindex are always in the range
|
|
|
|
* 0 <= index < BLOCKLEN.
|
2004-10-01 12:14:39 -03:00
|
|
|
* Their exact relationship is:
|
|
|
|
* (d.leftindex + d.len - 1) % BLOCKLEN == d.rightindex.
|
2004-10-01 03:24:12 -03:00
|
|
|
*
|
|
|
|
* Empty deques have d.len == 0; d.leftblock==d.rightblock;
|
|
|
|
* d.leftindex == CENTER+1; and d.rightindex == CENTER.
|
|
|
|
* Checking for d.len == 0 is the intended way to see whether d is empty.
|
|
|
|
*
|
2006-07-27 21:23:15 -03:00
|
|
|
* Whenever d.leftblock == d.rightblock,
|
2004-10-01 12:14:39 -03:00
|
|
|
* d.leftindex + d.len - 1 == d.rightindex.
|
2006-07-27 21:23:15 -03:00
|
|
|
*
|
2004-10-01 12:14:39 -03:00
|
|
|
* However, when d.leftblock != d.rightblock, d.leftindex and d.rightindex
|
2006-07-27 21:23:15 -03:00
|
|
|
* become indices into distinct blocks and either may be larger than the
|
2004-10-01 12:14:39 -03:00
|
|
|
* other.
|
2004-09-30 22:32:53 -03:00
|
|
|
*/
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
typedef struct BLOCK {
|
|
|
|
struct BLOCK *leftlink;
|
|
|
|
struct BLOCK *rightlink;
|
|
|
|
PyObject *data[BLOCKLEN];
|
|
|
|
} block;
|
|
|
|
|
2007-11-09 21:54:03 -04:00
|
|
|
#define MAXFREEBLOCKS 10
|
2008-07-23 21:08:18 -03:00
|
|
|
static Py_ssize_t numfreeblocks = 0;
|
2007-11-09 21:54:03 -04:00
|
|
|
static block *freeblocks[MAXFREEBLOCKS];
|
|
|
|
|
2004-09-30 22:04:50 -03:00
|
|
|
static block *
|
2008-07-23 21:08:18 -03:00
|
|
|
newblock(block *leftlink, block *rightlink, Py_ssize_t len) {
|
2004-10-06 14:51:54 -03:00
|
|
|
block *b;
|
2008-07-23 21:08:18 -03:00
|
|
|
/* To prevent len from overflowing PY_SSIZE_T_MAX on 64-bit machines, we
|
2004-10-06 14:51:54 -03:00
|
|
|
* refuse to allocate new blocks if the current len is dangerously
|
|
|
|
* close. There is some extra margin to prevent spurious arithmetic
|
|
|
|
* overflows at various places. The following check ensures that
|
|
|
|
* the blocks allocated to the deque, in the worst case, can only
|
2008-07-23 21:08:18 -03:00
|
|
|
* have PY_SSIZE_T_MAX-2 entries in total.
|
2004-10-06 14:51:54 -03:00
|
|
|
*/
|
2008-07-23 21:08:18 -03:00
|
|
|
if (len >= PY_SSIZE_T_MAX - 2*BLOCKLEN) {
|
2004-10-06 14:51:54 -03:00
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"cannot add more blocks to the deque");
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-11-09 21:54:03 -04:00
|
|
|
if (numfreeblocks) {
|
|
|
|
numfreeblocks -= 1;
|
|
|
|
b = freeblocks[numfreeblocks];
|
|
|
|
} else {
|
|
|
|
b = PyMem_Malloc(sizeof(block));
|
|
|
|
if (b == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
b->leftlink = leftlink;
|
|
|
|
b->rightlink = rightlink;
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
2008-06-13 04:47:47 -03:00
|
|
|
static void
|
2007-11-09 21:54:03 -04:00
|
|
|
freeblock(block *b)
|
|
|
|
{
|
|
|
|
if (numfreeblocks < MAXFREEBLOCKS) {
|
|
|
|
freeblocks[numfreeblocks] = b;
|
|
|
|
numfreeblocks++;
|
|
|
|
} else {
|
|
|
|
PyMem_Free(b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
block *leftblock;
|
|
|
|
block *rightblock;
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t leftindex; /* in range(BLOCKLEN) */
|
|
|
|
Py_ssize_t rightindex; /* in range(BLOCKLEN) */
|
|
|
|
Py_ssize_t len;
|
|
|
|
Py_ssize_t maxlen;
|
2004-10-01 21:43:13 -03:00
|
|
|
long state; /* incremented whenever the indices move */
|
2004-05-30 04:26:47 -03:00
|
|
|
PyObject *weakreflist; /* List of weak references */
|
2004-01-29 02:37:52 -04:00
|
|
|
} dequeobject;
|
|
|
|
|
2007-10-04 23:47:07 -03:00
|
|
|
/* The deque's size limit is d.maxlen. The limit can be zero or positive.
|
|
|
|
* If there is no limit, then d.maxlen == -1.
|
|
|
|
*
|
|
|
|
* After an item is added to a deque, we check to see if the size has grown past
|
|
|
|
* the limit. If it has, we get the size back down to the limit by popping an
|
|
|
|
* item off of the opposite end. The methods that can trigger this are append(),
|
|
|
|
* appendleft(), extend(), and extendleft().
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define TRIM(d, popfunction) \
|
|
|
|
if (d->maxlen != -1 && d->len > d->maxlen) { \
|
|
|
|
PyObject *rv = popfunction(d, NULL); \
|
|
|
|
assert(rv != NULL && d->len <= d->maxlen); \
|
|
|
|
Py_DECREF(rv); \
|
|
|
|
}
|
|
|
|
|
2004-02-29 11:40:53 -04:00
|
|
|
static PyTypeObject deque_type;
|
2004-02-28 22:15:56 -04:00
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
static PyObject *
|
|
|
|
deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
dequeobject *deque;
|
|
|
|
block *b;
|
|
|
|
|
|
|
|
/* create dequeobject structure */
|
|
|
|
deque = (dequeobject *)type->tp_alloc(type, 0);
|
|
|
|
if (deque == NULL)
|
|
|
|
return NULL;
|
2004-09-30 22:03:29 -03:00
|
|
|
|
2004-10-06 14:51:54 -03:00
|
|
|
b = newblock(NULL, NULL, 0);
|
2004-01-29 02:37:52 -04:00
|
|
|
if (b == NULL) {
|
|
|
|
Py_DECREF(deque);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-10-01 03:24:12 -03:00
|
|
|
assert(BLOCKLEN >= 2);
|
2004-01-29 02:37:52 -04:00
|
|
|
deque->leftblock = b;
|
|
|
|
deque->rightblock = b;
|
2004-10-01 03:24:12 -03:00
|
|
|
deque->leftindex = CENTER + 1;
|
|
|
|
deque->rightindex = CENTER;
|
2004-01-29 02:37:52 -04:00
|
|
|
deque->len = 0;
|
2004-10-01 21:43:13 -03:00
|
|
|
deque->state = 0;
|
2004-05-30 04:26:47 -03:00
|
|
|
deque->weakreflist = NULL;
|
2007-10-04 23:47:07 -03:00
|
|
|
deque->maxlen = -1;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
return (PyObject *)deque;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_pop(dequeobject *deque, PyObject *unused)
|
|
|
|
{
|
|
|
|
PyObject *item;
|
|
|
|
block *prevblock;
|
|
|
|
|
|
|
|
if (deque->len == 0) {
|
2004-02-28 22:15:56 -04:00
|
|
|
PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
|
2004-01-29 02:37:52 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
item = deque->rightblock->data[deque->rightindex];
|
|
|
|
deque->rightindex--;
|
|
|
|
deque->len--;
|
2004-10-01 21:43:13 -03:00
|
|
|
deque->state++;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
if (deque->rightindex == -1) {
|
|
|
|
if (deque->len == 0) {
|
|
|
|
assert(deque->leftblock == deque->rightblock);
|
|
|
|
assert(deque->leftindex == deque->rightindex+1);
|
|
|
|
/* re-center instead of freeing a block */
|
2004-10-01 03:24:12 -03:00
|
|
|
deque->leftindex = CENTER + 1;
|
|
|
|
deque->rightindex = CENTER;
|
2004-01-29 02:37:52 -04:00
|
|
|
} else {
|
|
|
|
prevblock = deque->rightblock->leftlink;
|
|
|
|
assert(deque->leftblock != deque->rightblock);
|
2007-11-09 21:54:03 -04:00
|
|
|
freeblock(deque->rightblock);
|
2004-01-29 02:37:52 -04:00
|
|
|
prevblock->rightlink = NULL;
|
|
|
|
deque->rightblock = prevblock;
|
|
|
|
deque->rightindex = BLOCKLEN - 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(pop_doc, "Remove and return the rightmost element.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_popleft(dequeobject *deque, PyObject *unused)
|
|
|
|
{
|
|
|
|
PyObject *item;
|
|
|
|
block *prevblock;
|
|
|
|
|
|
|
|
if (deque->len == 0) {
|
2004-02-28 22:15:56 -04:00
|
|
|
PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
|
2004-01-29 02:37:52 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
2006-08-13 15:13:02 -03:00
|
|
|
assert(deque->leftblock != NULL);
|
2004-01-29 02:37:52 -04:00
|
|
|
item = deque->leftblock->data[deque->leftindex];
|
|
|
|
deque->leftindex++;
|
|
|
|
deque->len--;
|
2004-10-01 21:43:13 -03:00
|
|
|
deque->state++;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
if (deque->leftindex == BLOCKLEN) {
|
|
|
|
if (deque->len == 0) {
|
|
|
|
assert(deque->leftblock == deque->rightblock);
|
|
|
|
assert(deque->leftindex == deque->rightindex+1);
|
|
|
|
/* re-center instead of freeing a block */
|
2004-10-01 03:24:12 -03:00
|
|
|
deque->leftindex = CENTER + 1;
|
|
|
|
deque->rightindex = CENTER;
|
2004-01-29 02:37:52 -04:00
|
|
|
} else {
|
|
|
|
assert(deque->leftblock != deque->rightblock);
|
|
|
|
prevblock = deque->leftblock->rightlink;
|
2007-11-09 21:54:03 -04:00
|
|
|
freeblock(deque->leftblock);
|
2004-01-29 02:37:52 -04:00
|
|
|
assert(prevblock != NULL);
|
|
|
|
prevblock->leftlink = NULL;
|
|
|
|
deque->leftblock = prevblock;
|
|
|
|
deque->leftindex = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element.");
|
|
|
|
|
2007-10-04 23:47:07 -03:00
|
|
|
static PyObject *
|
|
|
|
deque_append(dequeobject *deque, PyObject *item)
|
|
|
|
{
|
|
|
|
deque->state++;
|
|
|
|
if (deque->rightindex == BLOCKLEN-1) {
|
|
|
|
block *b = newblock(deque->rightblock, NULL, deque->len);
|
|
|
|
if (b == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(deque->rightblock->rightlink == NULL);
|
|
|
|
deque->rightblock->rightlink = b;
|
|
|
|
deque->rightblock = b;
|
|
|
|
deque->rightindex = -1;
|
|
|
|
}
|
|
|
|
Py_INCREF(item);
|
|
|
|
deque->len++;
|
|
|
|
deque->rightindex++;
|
|
|
|
deque->rightblock->data[deque->rightindex] = item;
|
|
|
|
TRIM(deque, deque_popleft);
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(append_doc, "Add an element to the right side of the deque.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_appendleft(dequeobject *deque, PyObject *item)
|
|
|
|
{
|
|
|
|
deque->state++;
|
|
|
|
if (deque->leftindex == 0) {
|
|
|
|
block *b = newblock(NULL, deque->leftblock, deque->len);
|
|
|
|
if (b == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(deque->leftblock->leftlink == NULL);
|
|
|
|
deque->leftblock->leftlink = b;
|
|
|
|
deque->leftblock = b;
|
|
|
|
deque->leftindex = BLOCKLEN;
|
|
|
|
}
|
|
|
|
Py_INCREF(item);
|
|
|
|
deque->len++;
|
|
|
|
deque->leftindex--;
|
|
|
|
deque->leftblock->data[deque->leftindex] = item;
|
|
|
|
TRIM(deque, deque_pop);
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque.");
|
|
|
|
|
2004-02-06 15:04:56 -04:00
|
|
|
static PyObject *
|
|
|
|
deque_extend(dequeobject *deque, PyObject *iterable)
|
|
|
|
{
|
|
|
|
PyObject *it, *item;
|
|
|
|
|
|
|
|
it = PyObject_GetIter(iterable);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
2004-10-01 21:43:13 -03:00
|
|
|
deque->state++;
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
if (deque->rightindex == BLOCKLEN-1) {
|
2004-10-06 14:51:54 -03:00
|
|
|
block *b = newblock(deque->rightblock, NULL,
|
|
|
|
deque->len);
|
2004-02-06 22:45:22 -04:00
|
|
|
if (b == NULL) {
|
|
|
|
Py_DECREF(item);
|
|
|
|
Py_DECREF(it);
|
2004-02-06 15:04:56 -04:00
|
|
|
return NULL;
|
2004-02-06 22:45:22 -04:00
|
|
|
}
|
2004-02-06 15:04:56 -04:00
|
|
|
assert(deque->rightblock->rightlink == NULL);
|
|
|
|
deque->rightblock->rightlink = b;
|
|
|
|
deque->rightblock = b;
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
deque->rightindex = -1;
|
2004-02-06 15:04:56 -04:00
|
|
|
}
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
deque->len++;
|
|
|
|
deque->rightindex++;
|
2004-02-06 15:04:56 -04:00
|
|
|
deque->rightblock->data[deque->rightindex] = item;
|
2007-10-04 23:47:07 -03:00
|
|
|
TRIM(deque, deque_popleft);
|
2004-02-06 15:04:56 -04:00
|
|
|
}
|
|
|
|
Py_DECREF(it);
|
2004-09-30 22:03:29 -03:00
|
|
|
if (PyErr_Occurred())
|
2004-02-06 15:04:56 -04:00
|
|
|
return NULL;
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2004-09-30 22:03:29 -03:00
|
|
|
PyDoc_STRVAR(extend_doc,
|
2004-02-06 15:04:56 -04:00
|
|
|
"Extend the right side of the deque with elements from the iterable");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_extendleft(dequeobject *deque, PyObject *iterable)
|
|
|
|
{
|
|
|
|
PyObject *it, *item;
|
|
|
|
|
|
|
|
it = PyObject_GetIter(iterable);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
2004-10-01 21:43:13 -03:00
|
|
|
deque->state++;
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
if (deque->leftindex == 0) {
|
2004-10-06 14:51:54 -03:00
|
|
|
block *b = newblock(NULL, deque->leftblock,
|
|
|
|
deque->len);
|
2004-02-06 22:45:22 -04:00
|
|
|
if (b == NULL) {
|
|
|
|
Py_DECREF(item);
|
|
|
|
Py_DECREF(it);
|
2004-02-06 15:04:56 -04:00
|
|
|
return NULL;
|
2004-02-06 22:45:22 -04:00
|
|
|
}
|
2004-02-06 15:04:56 -04:00
|
|
|
assert(deque->leftblock->leftlink == NULL);
|
|
|
|
deque->leftblock->leftlink = b;
|
|
|
|
deque->leftblock = b;
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
deque->leftindex = BLOCKLEN;
|
2004-02-06 15:04:56 -04:00
|
|
|
}
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
deque->len++;
|
|
|
|
deque->leftindex--;
|
2004-02-06 15:04:56 -04:00
|
|
|
deque->leftblock->data[deque->leftindex] = item;
|
2007-10-04 23:47:07 -03:00
|
|
|
TRIM(deque, deque_pop);
|
2004-02-06 15:04:56 -04:00
|
|
|
}
|
|
|
|
Py_DECREF(it);
|
2004-07-09 01:10:20 -03:00
|
|
|
if (PyErr_Occurred())
|
2004-02-06 15:04:56 -04:00
|
|
|
return NULL;
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2004-09-30 22:03:29 -03:00
|
|
|
PyDoc_STRVAR(extendleft_doc,
|
2004-02-06 15:04:56 -04:00
|
|
|
"Extend the left side of the deque with elements from the iterable");
|
|
|
|
|
2004-10-09 13:02:18 -03:00
|
|
|
static int
|
2006-02-15 13:27:45 -04:00
|
|
|
_deque_rotate(dequeobject *deque, Py_ssize_t n)
|
2004-02-07 17:13:00 -04:00
|
|
|
{
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t i, len=deque->len, halflen=(len+1)>>1;
|
2004-02-07 17:13:00 -04:00
|
|
|
PyObject *item, *rv;
|
|
|
|
|
2004-02-08 00:05:26 -04:00
|
|
|
if (len == 0)
|
2004-10-09 13:02:18 -03:00
|
|
|
return 0;
|
2004-02-08 00:05:26 -04:00
|
|
|
if (n > halflen || n < -halflen) {
|
|
|
|
n %= len;
|
|
|
|
if (n > halflen)
|
|
|
|
n -= len;
|
|
|
|
else if (n < -halflen)
|
|
|
|
n += len;
|
|
|
|
}
|
2004-02-07 17:13:00 -04:00
|
|
|
|
|
|
|
for (i=0 ; i<n ; i++) {
|
|
|
|
item = deque_pop(deque, NULL);
|
2004-07-09 01:10:20 -03:00
|
|
|
assert (item != NULL);
|
2004-02-07 17:13:00 -04:00
|
|
|
rv = deque_appendleft(deque, item);
|
|
|
|
Py_DECREF(item);
|
|
|
|
if (rv == NULL)
|
2004-10-09 13:02:18 -03:00
|
|
|
return -1;
|
2004-02-07 17:13:00 -04:00
|
|
|
Py_DECREF(rv);
|
|
|
|
}
|
|
|
|
for (i=0 ; i>n ; i--) {
|
|
|
|
item = deque_popleft(deque, NULL);
|
2004-07-09 01:10:20 -03:00
|
|
|
assert (item != NULL);
|
2004-02-07 17:13:00 -04:00
|
|
|
rv = deque_append(deque, item);
|
|
|
|
Py_DECREF(item);
|
|
|
|
if (rv == NULL)
|
2004-10-09 13:02:18 -03:00
|
|
|
return -1;
|
2004-02-07 17:13:00 -04:00
|
|
|
Py_DECREF(rv);
|
|
|
|
}
|
2004-10-09 13:02:18 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_rotate(dequeobject *deque, PyObject *args)
|
|
|
|
{
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t n=1;
|
2004-10-09 13:02:18 -03:00
|
|
|
|
2008-07-23 21:53:49 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "|n:rotate", &n))
|
2004-10-09 13:02:18 -03:00
|
|
|
return NULL;
|
|
|
|
if (_deque_rotate(deque, n) == 0)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
return NULL;
|
2004-02-07 17:13:00 -04:00
|
|
|
}
|
|
|
|
|
2004-09-30 22:03:29 -03:00
|
|
|
PyDoc_STRVAR(rotate_doc,
|
2004-02-08 00:05:26 -04:00
|
|
|
"Rotate the deque n steps to the right (default n=1). If n is negative, rotates left.");
|
2004-02-07 17:13:00 -04:00
|
|
|
|
2006-02-15 13:27:45 -04:00
|
|
|
static Py_ssize_t
|
2004-01-29 02:37:52 -04:00
|
|
|
deque_len(dequeobject *deque)
|
|
|
|
{
|
|
|
|
return deque->len;
|
|
|
|
}
|
|
|
|
|
2005-03-18 17:20:23 -04:00
|
|
|
static PyObject *
|
|
|
|
deque_remove(dequeobject *deque, PyObject *value)
|
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i, n=deque->len;
|
2005-03-18 17:20:23 -04:00
|
|
|
|
|
|
|
for (i=0 ; i<n ; i++) {
|
|
|
|
PyObject *item = deque->leftblock->data[deque->leftindex];
|
|
|
|
int cmp = PyObject_RichCompareBool(item, value, Py_EQ);
|
2005-03-18 20:00:51 -04:00
|
|
|
|
|
|
|
if (deque->len != n) {
|
2006-07-27 21:23:15 -03:00
|
|
|
PyErr_SetString(PyExc_IndexError,
|
2005-03-18 20:00:51 -04:00
|
|
|
"deque mutated during remove().");
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-03-18 17:20:23 -04:00
|
|
|
if (cmp > 0) {
|
2005-03-18 20:00:51 -04:00
|
|
|
PyObject *tgt = deque_popleft(deque, NULL);
|
2005-03-18 17:20:23 -04:00
|
|
|
assert (tgt != NULL);
|
|
|
|
Py_DECREF(tgt);
|
|
|
|
if (_deque_rotate(deque, i) == -1)
|
|
|
|
return NULL;
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
else if (cmp < 0) {
|
|
|
|
_deque_rotate(deque, i);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
_deque_rotate(deque, -1);
|
|
|
|
}
|
|
|
|
PyErr_SetString(PyExc_ValueError, "deque.remove(x): x not in deque");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(remove_doc,
|
|
|
|
"D.remove(value) -- remove first occurrence of value.");
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
static int
|
|
|
|
deque_clear(dequeobject *deque)
|
|
|
|
{
|
|
|
|
PyObject *item;
|
|
|
|
|
2004-10-01 21:43:13 -03:00
|
|
|
while (deque->len) {
|
2004-01-29 02:37:52 -04:00
|
|
|
item = deque_pop(deque, NULL);
|
2004-07-09 01:10:20 -03:00
|
|
|
assert (item != NULL);
|
2004-01-29 02:37:52 -04:00
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
assert(deque->leftblock == deque->rightblock &&
|
2004-10-01 21:43:13 -03:00
|
|
|
deque->leftindex - 1 == deque->rightindex &&
|
|
|
|
deque->len == 0);
|
2004-01-29 02:37:52 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-03-01 19:16:22 -04:00
|
|
|
static PyObject *
|
2008-07-23 21:08:18 -03:00
|
|
|
deque_item(dequeobject *deque, Py_ssize_t i)
|
2004-03-01 19:16:22 -04:00
|
|
|
{
|
|
|
|
block *b;
|
|
|
|
PyObject *item;
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t n, index=i;
|
2004-03-01 19:16:22 -04:00
|
|
|
|
|
|
|
if (i < 0 || i >= deque->len) {
|
|
|
|
PyErr_SetString(PyExc_IndexError,
|
|
|
|
"deque index out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-03-04 04:00:54 -04:00
|
|
|
if (i == 0) {
|
|
|
|
i = deque->leftindex;
|
2004-03-01 19:16:22 -04:00
|
|
|
b = deque->leftblock;
|
2004-03-04 04:00:54 -04:00
|
|
|
} else if (i == deque->len - 1) {
|
|
|
|
i = deque->rightindex;
|
2004-03-01 19:16:22 -04:00
|
|
|
b = deque->rightblock;
|
2004-03-04 04:00:54 -04:00
|
|
|
} else {
|
|
|
|
i += deque->leftindex;
|
|
|
|
n = i / BLOCKLEN;
|
|
|
|
i %= BLOCKLEN;
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
if (index < (deque->len >> 1)) {
|
2004-03-04 04:00:54 -04:00
|
|
|
b = deque->leftblock;
|
|
|
|
while (n--)
|
|
|
|
b = b->rightlink;
|
|
|
|
} else {
|
|
|
|
n = (deque->leftindex + deque->len - 1) / BLOCKLEN - n;
|
|
|
|
b = deque->rightblock;
|
|
|
|
while (n--)
|
|
|
|
b = b->leftlink;
|
|
|
|
}
|
2004-03-01 19:16:22 -04:00
|
|
|
}
|
|
|
|
item = b->data[i];
|
|
|
|
Py_INCREF(item);
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
2004-06-26 01:42:06 -03:00
|
|
|
/* delitem() implemented in terms of rotate for simplicity and reasonable
|
|
|
|
performance near the end points. If for some reason this method becomes
|
2004-09-30 22:03:29 -03:00
|
|
|
popular, it is not hard to re-implement this using direct data movement
|
2004-06-26 01:42:06 -03:00
|
|
|
(similar to code in list slice assignment) and achieve a two or threefold
|
|
|
|
performance boost.
|
|
|
|
*/
|
|
|
|
|
2004-05-12 17:55:56 -03:00
|
|
|
static int
|
2006-02-15 13:27:45 -04:00
|
|
|
deque_del_item(dequeobject *deque, Py_ssize_t i)
|
2004-05-12 17:55:56 -03:00
|
|
|
{
|
2004-10-09 13:02:18 -03:00
|
|
|
PyObject *item;
|
2004-05-12 17:55:56 -03:00
|
|
|
|
2004-09-30 22:03:29 -03:00
|
|
|
assert (i >= 0 && i < deque->len);
|
2004-10-09 13:02:18 -03:00
|
|
|
if (_deque_rotate(deque, -i) == -1)
|
|
|
|
return -1;
|
2004-05-12 17:55:56 -03:00
|
|
|
|
|
|
|
item = deque_popleft(deque, NULL);
|
2004-07-09 01:10:20 -03:00
|
|
|
assert (item != NULL);
|
2004-05-12 17:55:56 -03:00
|
|
|
Py_DECREF(item);
|
|
|
|
|
2004-10-09 13:02:18 -03:00
|
|
|
return _deque_rotate(deque, i);
|
2004-05-12 17:55:56 -03:00
|
|
|
}
|
|
|
|
|
2004-03-01 19:16:22 -04:00
|
|
|
static int
|
2006-02-15 13:27:45 -04:00
|
|
|
deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v)
|
2004-03-01 19:16:22 -04:00
|
|
|
{
|
|
|
|
PyObject *old_value;
|
|
|
|
block *b;
|
2006-02-16 10:30:23 -04:00
|
|
|
Py_ssize_t n, len=deque->len, halflen=(len+1)>>1, index=i;
|
2004-03-01 19:16:22 -04:00
|
|
|
|
2004-07-09 01:10:20 -03:00
|
|
|
if (i < 0 || i >= len) {
|
2004-03-01 19:16:22 -04:00
|
|
|
PyErr_SetString(PyExc_IndexError,
|
|
|
|
"deque index out of range");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-05-12 17:55:56 -03:00
|
|
|
if (v == NULL)
|
|
|
|
return deque_del_item(deque, i);
|
|
|
|
|
2004-03-01 19:16:22 -04:00
|
|
|
i += deque->leftindex;
|
|
|
|
n = i / BLOCKLEN;
|
|
|
|
i %= BLOCKLEN;
|
2004-07-09 01:10:20 -03:00
|
|
|
if (index <= halflen) {
|
2004-03-01 19:16:22 -04:00
|
|
|
b = deque->leftblock;
|
|
|
|
while (n--)
|
|
|
|
b = b->rightlink;
|
|
|
|
} else {
|
2004-07-09 01:10:20 -03:00
|
|
|
n = (deque->leftindex + len - 1) / BLOCKLEN - n;
|
2004-03-01 19:16:22 -04:00
|
|
|
b = deque->rightblock;
|
|
|
|
while (n--)
|
|
|
|
b = b->leftlink;
|
|
|
|
}
|
|
|
|
Py_INCREF(v);
|
|
|
|
old_value = b->data[i];
|
|
|
|
b->data[i] = v;
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
static PyObject *
|
|
|
|
deque_clearmethod(dequeobject *deque)
|
|
|
|
{
|
2004-07-09 01:10:20 -03:00
|
|
|
int rv;
|
|
|
|
|
|
|
|
rv = deque_clear(deque);
|
|
|
|
assert (rv != -1);
|
2004-01-29 02:37:52 -04:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(clear_doc, "Remove all elements from the deque.");
|
|
|
|
|
|
|
|
static void
|
|
|
|
deque_dealloc(dequeobject *deque)
|
|
|
|
{
|
|
|
|
PyObject_GC_UnTrack(deque);
|
2004-05-30 04:26:47 -03:00
|
|
|
if (deque->weakreflist != NULL)
|
|
|
|
PyObject_ClearWeakRefs((PyObject *) deque);
|
2004-01-29 02:37:52 -04:00
|
|
|
if (deque->leftblock != NULL) {
|
2004-07-18 21:10:24 -03:00
|
|
|
deque_clear(deque);
|
2004-01-29 02:37:52 -04:00
|
|
|
assert(deque->leftblock != NULL);
|
2007-11-09 21:54:03 -04:00
|
|
|
freeblock(deque->leftblock);
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
deque->leftblock = NULL;
|
|
|
|
deque->rightblock = NULL;
|
2007-12-18 22:37:44 -04:00
|
|
|
Py_TYPE(deque)->tp_free(deque);
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2004-03-01 19:16:22 -04:00
|
|
|
deque_traverse(dequeobject *deque, visitproc visit, void *arg)
|
2004-01-29 02:37:52 -04:00
|
|
|
{
|
2004-09-30 23:01:04 -03:00
|
|
|
block *b;
|
2004-01-29 02:37:52 -04:00
|
|
|
PyObject *item;
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t index;
|
|
|
|
Py_ssize_t indexlo = deque->leftindex;
|
2004-09-30 23:01:04 -03:00
|
|
|
|
|
|
|
for (b = deque->leftblock; b != NULL; b = b->rightlink) {
|
2008-07-23 21:08:18 -03:00
|
|
|
const Py_ssize_t indexhi = b == deque->rightblock ?
|
2004-09-30 23:01:04 -03:00
|
|
|
deque->rightindex :
|
|
|
|
BLOCKLEN - 1;
|
|
|
|
|
|
|
|
for (index = indexlo; index <= indexhi; ++index) {
|
|
|
|
item = b->data[index];
|
|
|
|
Py_VISIT(item);
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
2004-09-30 23:01:04 -03:00
|
|
|
indexlo = 0;
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_copy(PyObject *deque)
|
|
|
|
{
|
2007-10-09 21:26:46 -03:00
|
|
|
if (((dequeobject *)deque)->maxlen == -1)
|
2007-12-18 22:37:44 -04:00
|
|
|
return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "O", deque, NULL);
|
2007-10-09 21:26:46 -03:00
|
|
|
else
|
2007-12-18 22:37:44 -04:00
|
|
|
return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi",
|
2007-10-09 21:26:46 -03:00
|
|
|
deque, ((dequeobject *)deque)->maxlen, NULL);
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_reduce(dequeobject *deque)
|
|
|
|
{
|
2007-10-04 23:47:07 -03:00
|
|
|
PyObject *dict, *result, *aslist;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
2004-11-09 03:27:35 -04:00
|
|
|
dict = PyObject_GetAttrString((PyObject *)deque, "__dict__");
|
2007-10-04 23:47:07 -03:00
|
|
|
if (dict == NULL)
|
2004-11-09 03:27:35 -04:00
|
|
|
PyErr_Clear();
|
2007-10-04 23:47:07 -03:00
|
|
|
aslist = PySequence_List((PyObject *)deque);
|
|
|
|
if (aslist == NULL) {
|
2007-10-05 00:39:17 -03:00
|
|
|
Py_XDECREF(dict);
|
2004-01-29 02:37:52 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
2007-10-09 21:26:46 -03:00
|
|
|
if (dict == NULL) {
|
|
|
|
if (deque->maxlen == -1)
|
2007-12-18 22:37:44 -04:00
|
|
|
result = Py_BuildValue("O(O)", Py_TYPE(deque), aslist);
|
2007-10-09 21:26:46 -03:00
|
|
|
else
|
2008-07-23 21:08:18 -03:00
|
|
|
result = Py_BuildValue("O(On)", Py_TYPE(deque), aslist, deque->maxlen);
|
2007-10-09 21:26:46 -03:00
|
|
|
} else {
|
|
|
|
if (deque->maxlen == -1)
|
2007-12-18 22:37:44 -04:00
|
|
|
result = Py_BuildValue("O(OO)O", Py_TYPE(deque), aslist, Py_None, dict);
|
2007-10-09 21:26:46 -03:00
|
|
|
else
|
2008-07-23 21:08:18 -03:00
|
|
|
result = Py_BuildValue("O(On)O", Py_TYPE(deque), aslist, deque->maxlen, dict);
|
2007-10-09 21:26:46 -03:00
|
|
|
}
|
2007-10-04 23:47:07 -03:00
|
|
|
Py_XDECREF(dict);
|
|
|
|
Py_DECREF(aslist);
|
2004-01-29 02:37:52 -04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_repr(PyObject *deque)
|
|
|
|
{
|
2007-10-05 16:07:31 -03:00
|
|
|
PyObject *aslist, *result, *fmt;
|
2004-01-29 02:37:52 -04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
i = Py_ReprEnter(deque);
|
|
|
|
if (i != 0) {
|
|
|
|
if (i < 0)
|
|
|
|
return NULL;
|
2008-06-09 01:58:54 -03:00
|
|
|
return PyString_FromString("[...]");
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
aslist = PySequence_List(deque);
|
|
|
|
if (aslist == NULL) {
|
|
|
|
Py_ReprLeave(deque);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-10-04 23:47:07 -03:00
|
|
|
if (((dequeobject *)deque)->maxlen != -1)
|
2008-09-10 19:04:45 -03:00
|
|
|
fmt = PyString_FromFormat("deque(%%r, maxlen=%zd)",
|
2007-10-04 23:47:07 -03:00
|
|
|
((dequeobject *)deque)->maxlen);
|
|
|
|
else
|
2008-06-09 01:58:54 -03:00
|
|
|
fmt = PyString_FromString("deque(%r)");
|
2004-01-29 02:37:52 -04:00
|
|
|
if (fmt == NULL) {
|
|
|
|
Py_DECREF(aslist);
|
|
|
|
Py_ReprLeave(deque);
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-06-09 01:58:54 -03:00
|
|
|
result = PyString_Format(fmt, aslist);
|
2004-01-29 02:37:52 -04:00
|
|
|
Py_DECREF(fmt);
|
|
|
|
Py_DECREF(aslist);
|
|
|
|
Py_ReprLeave(deque);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
deque_tp_print(PyObject *deque, FILE *fp, int flags)
|
|
|
|
{
|
|
|
|
PyObject *it, *item;
|
|
|
|
char *emit = ""; /* No separator emitted on first pass */
|
|
|
|
char *separator = ", ";
|
|
|
|
int i;
|
|
|
|
|
|
|
|
i = Py_ReprEnter(deque);
|
|
|
|
if (i != 0) {
|
|
|
|
if (i < 0)
|
|
|
|
return i;
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
fputs("[...]", fp);
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
it = PyObject_GetIter(deque);
|
|
|
|
if (it == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
fputs("deque([", fp);
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
fputs(emit, fp);
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
emit = separator;
|
|
|
|
if (PyObject_Print(item, fp, 0) != 0) {
|
|
|
|
Py_DECREF(item);
|
|
|
|
Py_DECREF(it);
|
|
|
|
Py_ReprLeave(deque);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
Py_ReprLeave(deque);
|
|
|
|
Py_DECREF(it);
|
2004-09-30 22:03:29 -03:00
|
|
|
if (PyErr_Occurred())
|
2004-01-29 02:37:52 -04:00
|
|
|
return -1;
|
2007-10-04 23:47:07 -03:00
|
|
|
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2007-10-04 23:47:07 -03:00
|
|
|
if (((dequeobject *)deque)->maxlen == -1)
|
|
|
|
fputs("])", fp);
|
|
|
|
else
|
2008-08-22 17:10:27 -03:00
|
|
|
fprintf(fp, "], maxlen=%" PY_FORMAT_SIZE_T "d)", ((dequeobject *)deque)->maxlen);
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2004-01-29 02:37:52 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-02-28 22:15:56 -04:00
|
|
|
static PyObject *
|
|
|
|
deque_richcompare(PyObject *v, PyObject *w, int op)
|
|
|
|
{
|
|
|
|
PyObject *it1=NULL, *it2=NULL, *x, *y;
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t vs, ws;
|
|
|
|
int b, cmp=-1;
|
2004-02-28 22:15:56 -04:00
|
|
|
|
2004-09-30 22:03:29 -03:00
|
|
|
if (!PyObject_TypeCheck(v, &deque_type) ||
|
2004-05-18 15:15:03 -03:00
|
|
|
!PyObject_TypeCheck(w, &deque_type)) {
|
2004-02-28 22:15:56 -04:00
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
|
|
return Py_NotImplemented;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Shortcuts */
|
|
|
|
vs = ((dequeobject *)v)->len;
|
|
|
|
ws = ((dequeobject *)w)->len;
|
|
|
|
if (op == Py_EQ) {
|
|
|
|
if (v == w)
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
if (vs != ws)
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
if (op == Py_NE) {
|
|
|
|
if (v == w)
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
if (vs != ws)
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Search for the first index where items are different */
|
|
|
|
it1 = PyObject_GetIter(v);
|
|
|
|
if (it1 == NULL)
|
|
|
|
goto done;
|
|
|
|
it2 = PyObject_GetIter(w);
|
|
|
|
if (it2 == NULL)
|
|
|
|
goto done;
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
for (;;) {
|
2004-02-28 22:15:56 -04:00
|
|
|
x = PyIter_Next(it1);
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
if (x == NULL && PyErr_Occurred())
|
2004-02-28 22:15:56 -04:00
|
|
|
goto done;
|
|
|
|
y = PyIter_Next(it2);
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
if (x == NULL || y == NULL)
|
|
|
|
break;
|
2004-02-28 22:15:56 -04:00
|
|
|
b = PyObject_RichCompareBool(x, y, Py_EQ);
|
|
|
|
if (b == 0) {
|
|
|
|
cmp = PyObject_RichCompareBool(x, y, op);
|
|
|
|
Py_DECREF(x);
|
|
|
|
Py_DECREF(y);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
Py_DECREF(x);
|
|
|
|
Py_DECREF(y);
|
|
|
|
if (b == -1)
|
|
|
|
goto done;
|
|
|
|
}
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
/* We reached the end of one deque or both */
|
|
|
|
Py_XDECREF(x);
|
|
|
|
Py_XDECREF(y);
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
goto done;
|
2004-02-28 22:15:56 -04:00
|
|
|
switch (op) {
|
Upon insertion, if memory runs out, the deque was left in a corrupted state.
deque_item(): a performance bug: the linked list of blocks was followed
from the left in most cases, because the test (i < (deque->len >> 1)) was
after "i %= BLOCKLEN".
deque_clear(): replaced a call to deque_len() with deque->len; not sure what
this call was here for, nor if all compilers under the sun would inline it.
deque_traverse(): I belive that it could be called by the GC when the deque
has leftblock==rightblock==NULL, because it is tracked before the first block
is allocated (though closely before). Still, a C extension module subclassing
deque could provide its own tp_alloc that could trigger a GC collection after
the PyObject_GC_Track()...
deque_richcompare(): rewrote to cleanly check for end-of-iterations instead of
relying on deque.__iter__().next() to succeed exactly len(deque) times -- an
assumption which can break if deques are subclassed. Added a test.
I wonder if the length should be explicitely bounded to INT_MAX, with
OverflowErrors, as in listobject.c. On 64-bit machines, adding more than
INT_MAX in the deque will result in trouble. (Note to anyone/me fixing
this: carefully check for overflows if len is close to INT_MAX in the
following functions: deque_rotate(), deque_item(), deque_ass_item())
2004-10-02 10:59:34 -03:00
|
|
|
case Py_LT: cmp = y != NULL; break; /* if w was longer */
|
|
|
|
case Py_LE: cmp = x == NULL; break; /* if v was not longer */
|
|
|
|
case Py_EQ: cmp = x == y; break; /* if we reached the end of both */
|
|
|
|
case Py_NE: cmp = x != y; break; /* if one deque continues */
|
|
|
|
case Py_GT: cmp = x != NULL; break; /* if v was longer */
|
|
|
|
case Py_GE: cmp = y == NULL; break; /* if w was not longer */
|
2004-02-28 22:15:56 -04:00
|
|
|
}
|
2004-09-30 22:03:29 -03:00
|
|
|
|
2004-02-28 22:15:56 -04:00
|
|
|
done:
|
|
|
|
Py_XDECREF(it1);
|
|
|
|
Py_XDECREF(it2);
|
|
|
|
if (cmp == 1)
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
if (cmp == 0)
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
static int
|
2007-10-04 23:47:07 -03:00
|
|
|
deque_init(dequeobject *deque, PyObject *args, PyObject *kwdargs)
|
2004-01-29 02:37:52 -04:00
|
|
|
{
|
2004-02-06 15:04:56 -04:00
|
|
|
PyObject *iterable = NULL;
|
2007-10-09 21:26:46 -03:00
|
|
|
PyObject *maxlenobj = NULL;
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t maxlen = -1;
|
2007-10-04 23:47:07 -03:00
|
|
|
char *kwlist[] = {"iterable", "maxlen", 0};
|
2004-01-29 02:37:52 -04:00
|
|
|
|
2007-10-09 21:26:46 -03:00
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwdargs, "|OO:deque", kwlist, &iterable, &maxlenobj))
|
2007-10-04 23:47:07 -03:00
|
|
|
return -1;
|
2007-10-09 21:26:46 -03:00
|
|
|
if (maxlenobj != NULL && maxlenobj != Py_None) {
|
2008-07-23 21:08:18 -03:00
|
|
|
maxlen = PyInt_AsSsize_t(maxlenobj);
|
2007-10-09 21:26:46 -03:00
|
|
|
if (maxlen == -1 && PyErr_Occurred())
|
|
|
|
return -1;
|
|
|
|
if (maxlen < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "maxlen must be non-negative");
|
|
|
|
return -1;
|
|
|
|
}
|
2007-10-04 23:47:07 -03:00
|
|
|
}
|
|
|
|
deque->maxlen = maxlen;
|
2007-12-12 20:08:37 -04:00
|
|
|
deque_clear(deque);
|
2004-01-29 02:37:52 -04:00
|
|
|
if (iterable != NULL) {
|
2004-02-06 15:04:56 -04:00
|
|
|
PyObject *rv = deque_extend(deque, iterable);
|
|
|
|
if (rv == NULL)
|
2004-01-29 02:37:52 -04:00
|
|
|
return -1;
|
2004-02-06 15:04:56 -04:00
|
|
|
Py_DECREF(rv);
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PySequenceMethods deque_as_sequence = {
|
2006-02-15 13:27:45 -04:00
|
|
|
(lenfunc)deque_len, /* sq_length */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* sq_concat */
|
2004-03-01 19:16:22 -04:00
|
|
|
0, /* sq_repeat */
|
2006-02-15 13:27:45 -04:00
|
|
|
(ssizeargfunc)deque_item, /* sq_item */
|
2004-03-01 19:16:22 -04:00
|
|
|
0, /* sq_slice */
|
2006-02-15 13:27:45 -04:00
|
|
|
(ssizeobjargproc)deque_ass_item, /* sq_ass_item */
|
2004-01-29 02:37:52 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
/* deque object ********************************************************/
|
|
|
|
|
|
|
|
static PyObject *deque_iter(dequeobject *deque);
|
2004-03-18 07:04:57 -04:00
|
|
|
static PyObject *deque_reviter(dequeobject *deque);
|
2004-09-30 22:03:29 -03:00
|
|
|
PyDoc_STRVAR(reversed_doc,
|
2004-03-18 07:04:57 -04:00
|
|
|
"D.__reversed__() -- return a reverse iterator over the deque");
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
static PyMethodDef deque_methods[] = {
|
2004-09-30 22:03:29 -03:00
|
|
|
{"append", (PyCFunction)deque_append,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_O, append_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"appendleft", (PyCFunction)deque_appendleft,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_O, appendleft_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"clear", (PyCFunction)deque_clearmethod,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_NOARGS, clear_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"__copy__", (PyCFunction)deque_copy,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_NOARGS, copy_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"extend", (PyCFunction)deque_extend,
|
2004-02-07 17:13:00 -04:00
|
|
|
METH_O, extend_doc},
|
2005-03-18 17:20:23 -04:00
|
|
|
{"extendleft", (PyCFunction)deque_extendleft,
|
2004-02-07 17:13:00 -04:00
|
|
|
METH_O, extendleft_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"pop", (PyCFunction)deque_pop,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_NOARGS, pop_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"popleft", (PyCFunction)deque_popleft,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_NOARGS, popleft_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"__reduce__", (PyCFunction)deque_reduce,
|
2004-01-29 02:37:52 -04:00
|
|
|
METH_NOARGS, reduce_doc},
|
2005-03-18 17:20:23 -04:00
|
|
|
{"remove", (PyCFunction)deque_remove,
|
|
|
|
METH_O, remove_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"__reversed__", (PyCFunction)deque_reviter,
|
2004-03-18 07:04:57 -04:00
|
|
|
METH_NOARGS, reversed_doc},
|
2004-09-30 22:03:29 -03:00
|
|
|
{"rotate", (PyCFunction)deque_rotate,
|
2004-02-07 17:13:00 -04:00
|
|
|
METH_VARARGS, rotate_doc},
|
2004-01-29 02:37:52 -04:00
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
|
|
|
|
|
|
|
PyDoc_STRVAR(deque_doc,
|
2007-10-04 23:47:07 -03:00
|
|
|
"deque(iterable[, maxlen]) --> deque object\n\
|
2004-01-29 02:37:52 -04:00
|
|
|
\n\
|
|
|
|
Build an ordered collection accessible from endpoints only.");
|
|
|
|
|
2004-02-29 11:40:53 -04:00
|
|
|
static PyTypeObject deque_type = {
|
2007-07-21 03:55:02 -03:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
2004-01-29 02:37:52 -04:00
|
|
|
"collections.deque", /* tp_name */
|
|
|
|
sizeof(dequeobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)deque_dealloc, /* tp_dealloc */
|
2006-03-30 07:58:57 -04:00
|
|
|
deque_tp_print, /* tp_print */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
2006-03-30 07:58:57 -04:00
|
|
|
deque_repr, /* tp_repr */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* tp_as_number */
|
|
|
|
&deque_as_sequence, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
2008-07-15 11:27:37 -03:00
|
|
|
(hashfunc)PyObject_HashNotImplemented, /* tp_hash */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2004-05-30 04:26:47 -03:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
|
|
|
|
Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
|
2004-01-29 02:37:52 -04:00
|
|
|
deque_doc, /* tp_doc */
|
2004-03-01 19:16:22 -04:00
|
|
|
(traverseproc)deque_traverse, /* tp_traverse */
|
2004-01-29 02:37:52 -04:00
|
|
|
(inquiry)deque_clear, /* tp_clear */
|
2004-02-28 22:15:56 -04:00
|
|
|
(richcmpfunc)deque_richcompare, /* tp_richcompare */
|
2004-05-30 04:26:47 -03:00
|
|
|
offsetof(dequeobject, weakreflist), /* tp_weaklistoffset*/
|
2004-01-29 02:37:52 -04:00
|
|
|
(getiterfunc)deque_iter, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
deque_methods, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
(initproc)deque_init, /* tp_init */
|
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
deque_new, /* tp_new */
|
|
|
|
PyObject_GC_Del, /* tp_free */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*********************** Deque Iterator **************************/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t index;
|
2004-01-29 02:37:52 -04:00
|
|
|
block *b;
|
|
|
|
dequeobject *deque;
|
2004-10-01 21:43:13 -03:00
|
|
|
long state; /* state when the iterator is created */
|
2008-07-23 21:08:18 -03:00
|
|
|
Py_ssize_t counter; /* number of items remaining for iteration */
|
2004-01-29 02:37:52 -04:00
|
|
|
} dequeiterobject;
|
|
|
|
|
2008-06-13 04:47:47 -03:00
|
|
|
static PyTypeObject dequeiter_type;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_iter(dequeobject *deque)
|
|
|
|
{
|
|
|
|
dequeiterobject *it;
|
|
|
|
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
it = PyObject_GC_New(dequeiterobject, &dequeiter_type);
|
2004-01-29 02:37:52 -04:00
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
it->b = deque->leftblock;
|
|
|
|
it->index = deque->leftindex;
|
|
|
|
Py_INCREF(deque);
|
|
|
|
it->deque = deque;
|
2004-10-01 21:43:13 -03:00
|
|
|
it->state = deque->state;
|
2004-03-18 07:04:57 -04:00
|
|
|
it->counter = deque->len;
|
Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
2009-01-03 17:55:17 -04:00
|
|
|
PyObject_GC_Track(it);
|
2004-01-29 02:37:52 -04:00
|
|
|
return (PyObject *)it;
|
|
|
|
}
|
|
|
|
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
static int
|
|
|
|
dequeiter_traverse(dequeiterobject *dio, visitproc visit, void *arg)
|
|
|
|
{
|
|
|
|
Py_VISIT(dio->deque);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
static void
|
|
|
|
dequeiter_dealloc(dequeiterobject *dio)
|
|
|
|
{
|
|
|
|
Py_XDECREF(dio->deque);
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
PyObject_GC_Del(dio);
|
2004-01-29 02:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
dequeiter_next(dequeiterobject *it)
|
|
|
|
{
|
|
|
|
PyObject *item;
|
2004-10-01 21:43:13 -03:00
|
|
|
|
|
|
|
if (it->deque->state != it->state) {
|
2004-04-12 15:10:01 -03:00
|
|
|
it->counter = 0;
|
2004-01-29 02:37:52 -04:00
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
2004-10-01 21:43:13 -03:00
|
|
|
"deque mutated during iteration");
|
2004-01-29 02:37:52 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
2007-01-08 14:09:20 -04:00
|
|
|
if (it->counter == 0)
|
|
|
|
return NULL;
|
2006-07-27 21:23:15 -03:00
|
|
|
assert (!(it->b == it->deque->rightblock &&
|
2004-10-01 21:43:13 -03:00
|
|
|
it->index > it->deque->rightindex));
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
item = it->b->data[it->index];
|
|
|
|
it->index++;
|
2004-10-01 21:43:13 -03:00
|
|
|
it->counter--;
|
|
|
|
if (it->index == BLOCKLEN && it->counter > 0) {
|
|
|
|
assert (it->b->rightlink != NULL);
|
2004-01-29 02:37:52 -04:00
|
|
|
it->b = it->b->rightlink;
|
|
|
|
it->index = 0;
|
|
|
|
}
|
|
|
|
Py_INCREF(item);
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
2005-09-24 18:23:05 -03:00
|
|
|
static PyObject *
|
2004-03-18 07:04:57 -04:00
|
|
|
dequeiter_len(dequeiterobject *it)
|
|
|
|
{
|
2005-09-24 18:23:05 -03:00
|
|
|
return PyInt_FromLong(it->counter);
|
2004-03-18 07:04:57 -04:00
|
|
|
}
|
|
|
|
|
2006-02-11 17:32:43 -04:00
|
|
|
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
|
2005-09-24 18:23:05 -03:00
|
|
|
|
|
|
|
static PyMethodDef dequeiter_methods[] = {
|
2006-02-11 17:32:43 -04:00
|
|
|
{"__length_hint__", (PyCFunction)dequeiter_len, METH_NOARGS, length_hint_doc},
|
2005-09-24 18:23:05 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
2004-03-18 07:04:57 -04:00
|
|
|
};
|
|
|
|
|
2008-06-13 04:47:47 -03:00
|
|
|
static PyTypeObject dequeiter_type = {
|
2007-07-21 03:55:02 -03:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
2004-01-29 02:37:52 -04:00
|
|
|
"deque_iterator", /* tp_name */
|
|
|
|
sizeof(dequeiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)dequeiter_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
2005-09-24 18:23:05 -03:00
|
|
|
0, /* tp_as_sequence */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* tp_doc */
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
(traverseproc)dequeiter_traverse, /* tp_traverse */
|
2004-01-29 02:37:52 -04:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
|
|
|
(iternextfunc)dequeiter_next, /* tp_iternext */
|
2005-09-24 18:23:05 -03:00
|
|
|
dequeiter_methods, /* tp_methods */
|
2004-01-29 02:37:52 -04:00
|
|
|
0,
|
|
|
|
};
|
|
|
|
|
2004-03-18 07:04:57 -04:00
|
|
|
/*********************** Deque Reverse Iterator **************************/
|
|
|
|
|
2008-06-13 04:47:47 -03:00
|
|
|
static PyTypeObject dequereviter_type;
|
2004-03-18 07:04:57 -04:00
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
deque_reviter(dequeobject *deque)
|
|
|
|
{
|
|
|
|
dequeiterobject *it;
|
|
|
|
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
it = PyObject_GC_New(dequeiterobject, &dequereviter_type);
|
2004-03-18 07:04:57 -04:00
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
it->b = deque->rightblock;
|
|
|
|
it->index = deque->rightindex;
|
|
|
|
Py_INCREF(deque);
|
|
|
|
it->deque = deque;
|
2004-10-01 21:43:13 -03:00
|
|
|
it->state = deque->state;
|
2004-03-18 07:04:57 -04:00
|
|
|
it->counter = deque->len;
|
Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
2009-01-03 17:55:17 -04:00
|
|
|
PyObject_GC_Track(it);
|
2004-03-18 07:04:57 -04:00
|
|
|
return (PyObject *)it;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
dequereviter_next(dequeiterobject *it)
|
|
|
|
{
|
|
|
|
PyObject *item;
|
2004-10-01 21:43:13 -03:00
|
|
|
if (it->counter == 0)
|
2004-03-18 07:04:57 -04:00
|
|
|
return NULL;
|
|
|
|
|
2004-10-01 21:43:13 -03:00
|
|
|
if (it->deque->state != it->state) {
|
2004-04-12 15:10:01 -03:00
|
|
|
it->counter = 0;
|
2004-03-18 07:04:57 -04:00
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
2004-10-01 21:43:13 -03:00
|
|
|
"deque mutated during iteration");
|
2004-03-18 07:04:57 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
2006-07-27 21:23:15 -03:00
|
|
|
assert (!(it->b == it->deque->leftblock &&
|
2004-10-01 21:43:13 -03:00
|
|
|
it->index < it->deque->leftindex));
|
2004-03-18 07:04:57 -04:00
|
|
|
|
|
|
|
item = it->b->data[it->index];
|
|
|
|
it->index--;
|
2004-10-01 21:43:13 -03:00
|
|
|
it->counter--;
|
|
|
|
if (it->index == -1 && it->counter > 0) {
|
|
|
|
assert (it->b->leftlink != NULL);
|
2004-03-18 07:04:57 -04:00
|
|
|
it->b = it->b->leftlink;
|
|
|
|
it->index = BLOCKLEN - 1;
|
|
|
|
}
|
|
|
|
Py_INCREF(item);
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
2008-06-13 04:47:47 -03:00
|
|
|
static PyTypeObject dequereviter_type = {
|
2007-07-21 03:55:02 -03:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
2004-03-18 07:04:57 -04:00
|
|
|
"deque_reverse_iterator", /* tp_name */
|
|
|
|
sizeof(dequeiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)dequeiter_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
2005-09-24 18:23:05 -03:00
|
|
|
0, /* tp_as_sequence */
|
2004-03-18 07:04:57 -04:00
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
2004-03-18 07:04:57 -04:00
|
|
|
0, /* tp_doc */
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
(traverseproc)dequeiter_traverse, /* tp_traverse */
|
2004-03-18 07:04:57 -04:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
|
|
|
(iternextfunc)dequereviter_next, /* tp_iternext */
|
2005-09-24 18:23:05 -03:00
|
|
|
dequeiter_methods, /* tp_methods */
|
2004-03-18 07:04:57 -04:00
|
|
|
0,
|
|
|
|
};
|
|
|
|
|
2006-02-25 18:38:04 -04:00
|
|
|
/* defaultdict type *********************************************************/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyDictObject dict;
|
|
|
|
PyObject *default_factory;
|
|
|
|
} defdictobject;
|
|
|
|
|
|
|
|
static PyTypeObject defdict_type; /* Forward */
|
|
|
|
|
|
|
|
PyDoc_STRVAR(defdict_missing_doc,
|
|
|
|
"__missing__(key) # Called by __getitem__ for missing key; pseudo-code:\n\
|
2007-03-06 09:32:52 -04:00
|
|
|
if self.default_factory is None: raise KeyError((key,))\n\
|
2006-02-25 18:38:04 -04:00
|
|
|
self[key] = value = self.default_factory()\n\
|
|
|
|
return value\n\
|
|
|
|
");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
defdict_missing(defdictobject *dd, PyObject *key)
|
|
|
|
{
|
|
|
|
PyObject *factory = dd->default_factory;
|
|
|
|
PyObject *value;
|
|
|
|
if (factory == NULL || factory == Py_None) {
|
|
|
|
/* XXX Call dict.__missing__(key) */
|
2007-03-06 09:32:52 -04:00
|
|
|
PyObject *tup;
|
|
|
|
tup = PyTuple_Pack(1, key);
|
|
|
|
if (!tup) return NULL;
|
|
|
|
PyErr_SetObject(PyExc_KeyError, tup);
|
|
|
|
Py_DECREF(tup);
|
2006-02-25 18:38:04 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
value = PyEval_CallObject(factory, NULL);
|
|
|
|
if (value == NULL)
|
|
|
|
return value;
|
|
|
|
if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {
|
|
|
|
Py_DECREF(value);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(defdict_copy_doc, "D.copy() -> a shallow copy of D.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
defdict_copy(defdictobject *dd)
|
|
|
|
{
|
|
|
|
/* This calls the object's class. That only works for subclasses
|
|
|
|
whose class constructor has the same signature. Subclasses that
|
2008-02-12 15:05:36 -04:00
|
|
|
define a different constructor signature must override copy().
|
2006-02-25 18:38:04 -04:00
|
|
|
*/
|
2009-08-04 15:49:26 -03:00
|
|
|
|
|
|
|
if (dd->default_factory == NULL)
|
|
|
|
return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL);
|
2007-12-18 22:37:44 -04:00
|
|
|
return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd),
|
2006-02-25 18:38:04 -04:00
|
|
|
dd->default_factory, dd, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
defdict_reduce(defdictobject *dd)
|
|
|
|
{
|
2006-07-27 21:23:15 -03:00
|
|
|
/* __reduce__ must return a 5-tuple as follows:
|
2006-02-25 18:38:04 -04:00
|
|
|
|
|
|
|
- factory function
|
|
|
|
- tuple of args for the factory function
|
|
|
|
- additional state (here None)
|
|
|
|
- sequence iterator (here None)
|
|
|
|
- dictionary iterator (yielding successive (key, value) pairs
|
|
|
|
|
|
|
|
This API is used by pickle.py and copy.py.
|
|
|
|
|
|
|
|
For this to be useful with pickle.py, the default_factory
|
|
|
|
must be picklable; e.g., None, a built-in, or a global
|
|
|
|
function in a module or package.
|
|
|
|
|
|
|
|
Both shallow and deep copying are supported, but for deep
|
|
|
|
copying, the default_factory must be deep-copyable; e.g. None,
|
|
|
|
or a built-in (functions are not copyable at this time).
|
|
|
|
|
|
|
|
This only works for subclasses as long as their constructor
|
|
|
|
signature is compatible; the first argument must be the
|
|
|
|
optional default_factory, defaulting to None.
|
|
|
|
*/
|
|
|
|
PyObject *args;
|
|
|
|
PyObject *items;
|
|
|
|
PyObject *result;
|
|
|
|
if (dd->default_factory == NULL || dd->default_factory == Py_None)
|
|
|
|
args = PyTuple_New(0);
|
|
|
|
else
|
|
|
|
args = PyTuple_Pack(1, dd->default_factory);
|
|
|
|
if (args == NULL)
|
|
|
|
return NULL;
|
|
|
|
items = PyObject_CallMethod((PyObject *)dd, "iteritems", "()");
|
|
|
|
if (items == NULL) {
|
|
|
|
Py_DECREF(args);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-12-18 22:37:44 -04:00
|
|
|
result = PyTuple_Pack(5, Py_TYPE(dd), args,
|
2006-02-25 18:38:04 -04:00
|
|
|
Py_None, Py_None, items);
|
2006-07-27 21:23:15 -03:00
|
|
|
Py_DECREF(items);
|
2006-02-25 18:38:04 -04:00
|
|
|
Py_DECREF(args);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef defdict_methods[] = {
|
|
|
|
{"__missing__", (PyCFunction)defdict_missing, METH_O,
|
|
|
|
defdict_missing_doc},
|
2008-02-12 15:05:36 -04:00
|
|
|
{"copy", (PyCFunction)defdict_copy, METH_NOARGS,
|
2006-02-25 18:38:04 -04:00
|
|
|
defdict_copy_doc},
|
|
|
|
{"__copy__", (PyCFunction)defdict_copy, METH_NOARGS,
|
|
|
|
defdict_copy_doc},
|
|
|
|
{"__reduce__", (PyCFunction)defdict_reduce, METH_NOARGS,
|
|
|
|
reduce_doc},
|
|
|
|
{NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static PyMemberDef defdict_members[] = {
|
|
|
|
{"default_factory", T_OBJECT,
|
|
|
|
offsetof(defdictobject, default_factory), 0,
|
|
|
|
PyDoc_STR("Factory for default value called by __missing__().")},
|
|
|
|
{NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
defdict_dealloc(defdictobject *dd)
|
|
|
|
{
|
|
|
|
Py_CLEAR(dd->default_factory);
|
|
|
|
PyDict_Type.tp_dealloc((PyObject *)dd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
defdict_print(defdictobject *dd, FILE *fp, int flags)
|
|
|
|
{
|
|
|
|
int sts;
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2006-02-25 18:38:04 -04:00
|
|
|
fprintf(fp, "defaultdict(");
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (dd->default_factory == NULL) {
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2006-02-25 18:38:04 -04:00
|
|
|
fprintf(fp, "None");
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
} else {
|
2006-02-25 18:38:04 -04:00
|
|
|
PyObject_Print(dd->default_factory, fp, 0);
|
|
|
|
}
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2006-02-25 18:38:04 -04:00
|
|
|
fprintf(fp, ", ");
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2006-02-25 18:38:04 -04:00
|
|
|
sts = PyDict_Type.tp_print((PyObject *)dd, fp, 0);
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2006-02-25 18:38:04 -04:00
|
|
|
fprintf(fp, ")");
|
2007-10-05 16:07:31 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2006-02-25 18:38:04 -04:00
|
|
|
return sts;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
defdict_repr(defdictobject *dd)
|
|
|
|
{
|
|
|
|
PyObject *defrepr;
|
|
|
|
PyObject *baserepr;
|
|
|
|
PyObject *result;
|
|
|
|
baserepr = PyDict_Type.tp_repr((PyObject *)dd);
|
|
|
|
if (baserepr == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (dd->default_factory == NULL)
|
2008-06-09 01:58:54 -03:00
|
|
|
defrepr = PyString_FromString("None");
|
2006-02-25 18:38:04 -04:00
|
|
|
else
|
2008-02-07 20:56:02 -04:00
|
|
|
{
|
|
|
|
int status = Py_ReprEnter(dd->default_factory);
|
|
|
|
if (status != 0) {
|
|
|
|
if (status < 0)
|
|
|
|
return NULL;
|
2008-06-09 01:58:54 -03:00
|
|
|
defrepr = PyString_FromString("...");
|
2008-02-07 20:56:02 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
defrepr = PyObject_Repr(dd->default_factory);
|
|
|
|
Py_ReprLeave(dd->default_factory);
|
|
|
|
}
|
2006-02-25 18:38:04 -04:00
|
|
|
if (defrepr == NULL) {
|
|
|
|
Py_DECREF(baserepr);
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-06-09 01:58:54 -03:00
|
|
|
result = PyString_FromFormat("defaultdict(%s, %s)",
|
|
|
|
PyString_AS_STRING(defrepr),
|
|
|
|
PyString_AS_STRING(baserepr));
|
2006-02-25 18:38:04 -04:00
|
|
|
Py_DECREF(defrepr);
|
|
|
|
Py_DECREF(baserepr);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
defdict_traverse(PyObject *self, visitproc visit, void *arg)
|
|
|
|
{
|
|
|
|
Py_VISIT(((defdictobject *)self)->default_factory);
|
|
|
|
return PyDict_Type.tp_traverse(self, visit, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
defdict_tp_clear(defdictobject *dd)
|
|
|
|
{
|
2006-04-15 14:28:34 -03:00
|
|
|
Py_CLEAR(dd->default_factory);
|
2006-02-25 18:38:04 -04:00
|
|
|
return PyDict_Type.tp_clear((PyObject *)dd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
defdict_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
defdictobject *dd = (defdictobject *)self;
|
|
|
|
PyObject *olddefault = dd->default_factory;
|
|
|
|
PyObject *newdefault = NULL;
|
|
|
|
PyObject *newargs;
|
|
|
|
int result;
|
|
|
|
if (args == NULL || !PyTuple_Check(args))
|
|
|
|
newargs = PyTuple_New(0);
|
|
|
|
else {
|
|
|
|
Py_ssize_t n = PyTuple_GET_SIZE(args);
|
2007-02-07 17:42:17 -04:00
|
|
|
if (n > 0) {
|
2006-02-25 18:38:04 -04:00
|
|
|
newdefault = PyTuple_GET_ITEM(args, 0);
|
2009-08-04 15:49:26 -03:00
|
|
|
if (!PyCallable_Check(newdefault) && newdefault != Py_None) {
|
2007-02-07 17:42:17 -04:00
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"first argument must be callable");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2006-02-25 18:38:04 -04:00
|
|
|
newargs = PySequence_GetSlice(args, 1, n);
|
|
|
|
}
|
|
|
|
if (newargs == NULL)
|
|
|
|
return -1;
|
|
|
|
Py_XINCREF(newdefault);
|
|
|
|
dd->default_factory = newdefault;
|
|
|
|
result = PyDict_Type.tp_init(self, newargs, kwds);
|
|
|
|
Py_DECREF(newargs);
|
|
|
|
Py_XDECREF(olddefault);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(defdict_doc,
|
|
|
|
"defaultdict(default_factory) --> dict with default factory\n\
|
|
|
|
\n\
|
|
|
|
The default factory is called without arguments to produce\n\
|
|
|
|
a new value when a key is not present, in __getitem__ only.\n\
|
|
|
|
A defaultdict compares equal to a dict with the same items.\n\
|
|
|
|
");
|
|
|
|
|
2006-04-04 12:05:23 -03:00
|
|
|
/* See comment in xxsubtype.c */
|
|
|
|
#define DEFERRED_ADDRESS(ADDR) 0
|
|
|
|
|
2006-02-25 18:38:04 -04:00
|
|
|
static PyTypeObject defdict_type = {
|
2007-07-21 03:55:02 -03:00
|
|
|
PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
|
2006-02-25 18:38:04 -04:00
|
|
|
"collections.defaultdict", /* tp_name */
|
|
|
|
sizeof(defdictobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)defdict_dealloc, /* tp_dealloc */
|
|
|
|
(printfunc)defdict_print, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
(reprfunc)defdict_repr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC |
|
|
|
|
Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
|
|
|
|
defdict_doc, /* tp_doc */
|
2006-03-30 07:58:57 -04:00
|
|
|
defdict_traverse, /* tp_traverse */
|
2006-02-25 18:38:04 -04:00
|
|
|
(inquiry)defdict_tp_clear, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset*/
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
defdict_methods, /* tp_methods */
|
|
|
|
defdict_members, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
2006-04-04 12:05:23 -03:00
|
|
|
DEFERRED_ADDRESS(&PyDict_Type), /* tp_base */
|
2006-02-25 18:38:04 -04:00
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
2006-03-30 07:58:57 -04:00
|
|
|
defdict_init, /* tp_init */
|
2006-02-25 18:38:04 -04:00
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
0, /* tp_new */
|
|
|
|
PyObject_GC_Del, /* tp_free */
|
|
|
|
};
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
/* module level code ********************************************************/
|
|
|
|
|
|
|
|
PyDoc_STRVAR(module_doc,
|
2006-02-25 18:38:04 -04:00
|
|
|
"High performance data structures.\n\
|
|
|
|
- deque: ordered collection accessible from endpoints only\n\
|
|
|
|
- defaultdict: dict subclass with a default value factory\n\
|
2004-01-29 02:37:52 -04:00
|
|
|
");
|
|
|
|
|
|
|
|
PyMODINIT_FUNC
|
2007-02-28 14:37:52 -04:00
|
|
|
init_collections(void)
|
2004-01-29 02:37:52 -04:00
|
|
|
{
|
|
|
|
PyObject *m;
|
|
|
|
|
2007-02-28 14:37:52 -04:00
|
|
|
m = Py_InitModule3("_collections", NULL, module_doc);
|
2006-01-19 02:09:39 -04:00
|
|
|
if (m == NULL)
|
|
|
|
return;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
|
|
|
if (PyType_Ready(&deque_type) < 0)
|
|
|
|
return;
|
|
|
|
Py_INCREF(&deque_type);
|
|
|
|
PyModule_AddObject(m, "deque", (PyObject *)&deque_type);
|
|
|
|
|
2006-04-04 12:05:23 -03:00
|
|
|
defdict_type.tp_base = &PyDict_Type;
|
2006-02-25 18:38:04 -04:00
|
|
|
if (PyType_Ready(&defdict_type) < 0)
|
|
|
|
return;
|
|
|
|
Py_INCREF(&defdict_type);
|
|
|
|
PyModule_AddObject(m, "defaultdict", (PyObject *)&defdict_type);
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
if (PyType_Ready(&dequeiter_type) < 0)
|
2004-09-30 22:03:29 -03:00
|
|
|
return;
|
2004-01-29 02:37:52 -04:00
|
|
|
|
2004-03-18 07:04:57 -04:00
|
|
|
if (PyType_Ready(&dequereviter_type) < 0)
|
|
|
|
return;
|
|
|
|
|
2004-01-29 02:37:52 -04:00
|
|
|
return;
|
|
|
|
}
|