1991-02-19 20:39:46 +08:00
|
|
|
|
1990-10-14 20:07:46 +08:00
|
|
|
/* Tuple object implementation */
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
#include "Python.h"
|
2020-04-08 08:01:56 +08:00
|
|
|
#include "pycore_abstract.h" // _PyIndex_Check()
|
2018-11-01 09:30:36 +08:00
|
|
|
#include "pycore_accu.h"
|
2020-04-14 23:52:15 +08:00
|
|
|
#include "pycore_gc.h" // _PyObject_GC_IS_TRACKED()
|
|
|
|
#include "pycore_object.h"
|
1990-10-14 20:07:46 +08:00
|
|
|
|
2017-03-19 14:47:58 +08:00
|
|
|
/*[clinic input]
|
|
|
|
class tuple "PyTupleObject *" "&PyTuple_Type"
|
|
|
|
[clinic start generated code]*/
|
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=f051ba3cfdf9a189]*/
|
|
|
|
|
|
|
|
#include "clinic/tupleobject.c.h"
|
|
|
|
|
2019-08-14 22:10:33 +08:00
|
|
|
static inline void
|
|
|
|
tuple_gc_track(PyTupleObject *op)
|
|
|
|
{
|
|
|
|
_PyObject_GC_TRACK(op);
|
|
|
|
}
|
|
|
|
|
2012-06-23 02:55:41 +08:00
|
|
|
/* Print summary info about the state of the optimized allocator */
|
|
|
|
void
|
|
|
|
_PyTuple_DebugMallocStats(FILE *out)
|
|
|
|
{
|
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
for (int i = 1; i < PyTuple_MAXSAVESIZE; i++) {
|
|
|
|
char buf[128];
|
2012-06-23 02:55:41 +08:00
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
|
|
"free %d-sized PyTupleObject", i);
|
2020-06-05 05:38:36 +08:00
|
|
|
_PyDebugAllocatorStats(out, buf, state->numfree[i],
|
|
|
|
_PyObject_VAR_SIZE(&PyTuple_Type, i));
|
2012-06-23 02:55:41 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2009-03-24 02:52:06 +08:00
|
|
|
|
2019-08-14 22:10:33 +08:00
|
|
|
/* Allocate an uninitialized tuple object. Before making it public following
|
|
|
|
steps must be done:
|
|
|
|
- initialize its items
|
|
|
|
- call tuple_gc_track() on it
|
|
|
|
Because the empty tuple is always reused and it's already tracked by GC,
|
|
|
|
this function must not be called with size == 0 (unless from PyTuple_New()
|
|
|
|
which wraps this function).
|
|
|
|
*/
|
|
|
|
static PyTupleObject *
|
2020-06-05 05:38:36 +08:00
|
|
|
tuple_alloc(struct _Py_tuple_state *state, Py_ssize_t size)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2013-08-14 02:18:52 +08:00
|
|
|
PyTupleObject *op;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (size < 0) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60568 | christian.heimes | 2008-02-04 19:48:38 +0100 (Mon, 04 Feb 2008) | 1 line
Increase debugging to investige failing tests on some build bots
........
r60570 | christian.heimes | 2008-02-04 20:30:05 +0100 (Mon, 04 Feb 2008) | 1 line
Small adjustments for test compact freelist test. It's no passing on Windows as well.
........
r60573 | amaury.forgeotdarc | 2008-02-04 21:53:14 +0100 (Mon, 04 Feb 2008) | 2 lines
Correct quotes in NEWS file
........
r60575 | amaury.forgeotdarc | 2008-02-04 22:45:05 +0100 (Mon, 04 Feb 2008) | 13 lines
#1750076: Debugger did not step on every iteration of a while statement.
The mapping between bytecode offsets and source lines (lnotab) did not contain
an entry for the beginning of the loop.
Now it does, and the lnotab can be a bit larger:
in particular, several statements on the same line generate several entries.
However, this does not bother the settrace function, which will trigger only
one 'line' event.
The lnotab seems to be exactly the same as with python2.4.
........
r60584 | amaury.forgeotdarc | 2008-02-05 01:26:21 +0100 (Tue, 05 Feb 2008) | 3 lines
Change r60575 broke test_compile:
there is no need to emit co_lnotab item when both offsets are zeros.
........
r60587 | skip.montanaro | 2008-02-05 03:32:16 +0100 (Tue, 05 Feb 2008) | 1 line
sync with most recent version from python-mode sf project
........
r60588 | lars.gustaebel | 2008-02-05 12:51:40 +0100 (Tue, 05 Feb 2008) | 5 lines
Issue #2004: Use mode 0700 for temporary directories and default
permissions for missing directories.
(will backport to 2.5)
........
r60590 | georg.brandl | 2008-02-05 13:01:24 +0100 (Tue, 05 Feb 2008) | 2 lines
Convert external links to internal links. Fixes #2010.
........
r60592 | marc-andre.lemburg | 2008-02-05 15:50:40 +0100 (Tue, 05 Feb 2008) | 3 lines
Keep distutils Python 2.1 compatible (or even Python 2.4 in this case).
........
r60593 | andrew.kuchling | 2008-02-05 17:06:57 +0100 (Tue, 05 Feb 2008) | 5 lines
Update PEP URL.
(This code is duplicated between pydoc and DocXMLRPCServer; maybe it
should be refactored as a GHOP project.)
2.5.2 backport candidate.
........
r60596 | guido.van.rossum | 2008-02-05 18:32:15 +0100 (Tue, 05 Feb 2008) | 2 lines
In the experimental 'Scanner' feature, the group count was set wrong.
........
r60602 | facundo.batista | 2008-02-05 20:03:32 +0100 (Tue, 05 Feb 2008) | 3 lines
Issue 1951. Converts wave test cases to unittest.
........
r60603 | georg.brandl | 2008-02-05 20:07:10 +0100 (Tue, 05 Feb 2008) | 2 lines
Actually run the test.
........
r60604 | skip.montanaro | 2008-02-05 20:24:30 +0100 (Tue, 05 Feb 2008) | 2 lines
correct object name
........
r60605 | georg.brandl | 2008-02-05 20:58:17 +0100 (Tue, 05 Feb 2008) | 7 lines
* Use the same code to profile for test_profile and test_cprofile.
* Convert both to unittest.
* Use the same unit testing code.
* Include the expected output in both test files.
* Make it possible to regenerate the expected output by running
the file as a script with an '-r' argument.
........
r60613 | raymond.hettinger | 2008-02-06 02:49:00 +0100 (Wed, 06 Feb 2008) | 1 line
Sync-up with Py3k work.
........
r60614 | christian.heimes | 2008-02-06 13:44:34 +0100 (Wed, 06 Feb 2008) | 1 line
Limit free list of method and builtin function objects to 256 entries each.
........
r60616 | christian.heimes | 2008-02-06 14:33:44 +0100 (Wed, 06 Feb 2008) | 7 lines
Unified naming convention for free lists and their limits. All free lists
in Object/ are named ``free_list``, the counter ``numfree`` and the upper
limit is a macro ``PyName_MAXFREELIST`` inside an #ifndef block.
The chances should make it easier to adjust Python for platforms with
less memory, e.g. mobile phones.
........
2008-02-06 22:31:34 +08:00
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2020-06-08 08:14:47 +08:00
|
|
|
#ifdef Py_DEBUG
|
|
|
|
// tuple_alloc() must not be called after _PyTuple_Fini()
|
|
|
|
assert(state->numfree[0] != -1);
|
|
|
|
#endif
|
2020-06-05 05:38:36 +08:00
|
|
|
if (size < PyTuple_MAXSAVESIZE && (op = state->free_list[size]) != NULL) {
|
2019-08-14 22:10:33 +08:00
|
|
|
assert(size != 0);
|
2020-06-05 05:38:36 +08:00
|
|
|
state->free_list[size] = (PyTupleObject *) op->ob_item[0];
|
|
|
|
state->numfree[size]--;
|
2020-06-16 07:28:07 +08:00
|
|
|
/* Inlined _PyObject_InitVar() without _PyType_HasFeature() test */
|
1998-12-11 22:56:38 +08:00
|
|
|
#ifdef Py_TRACE_REFS
|
2020-05-27 20:55:10 +08:00
|
|
|
Py_SET_SIZE(op, size);
|
2020-05-26 01:25:28 +08:00
|
|
|
Py_SET_TYPE(op, &PyTuple_Type);
|
1993-10-16 00:18:48 +08:00
|
|
|
#endif
|
2010-05-09 23:52:27 +08:00
|
|
|
_Py_NewReference((PyObject *)op);
|
|
|
|
}
|
|
|
|
else
|
1993-10-16 00:18:48 +08:00
|
|
|
#endif
|
2010-05-09 23:52:27 +08:00
|
|
|
{
|
|
|
|
/* Check for overflow */
|
2019-09-10 04:40:58 +08:00
|
|
|
if ((size_t)size > ((size_t)PY_SSIZE_T_MAX - (sizeof(PyTupleObject) -
|
|
|
|
sizeof(PyObject *))) / sizeof(PyObject *)) {
|
2019-08-14 22:10:33 +08:00
|
|
|
return (PyTupleObject *)PyErr_NoMemory();
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
|
|
|
|
if (op == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
return op;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyTuple_New(Py_ssize_t size)
|
|
|
|
{
|
|
|
|
PyTupleObject *op;
|
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
if (size == 0 && state->free_list[0]) {
|
|
|
|
op = state->free_list[0];
|
2019-08-14 22:10:33 +08:00
|
|
|
Py_INCREF(op);
|
|
|
|
return (PyObject *) op;
|
|
|
|
}
|
|
|
|
#endif
|
2020-06-05 05:38:36 +08:00
|
|
|
op = tuple_alloc(state, size);
|
2019-09-04 21:58:05 +08:00
|
|
|
if (op == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
for (Py_ssize_t i = 0; i < size; i++) {
|
2010-05-09 23:52:27 +08:00
|
|
|
op->ob_item[i] = NULL;
|
2019-08-14 22:10:33 +08:00
|
|
|
}
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60568 | christian.heimes | 2008-02-04 19:48:38 +0100 (Mon, 04 Feb 2008) | 1 line
Increase debugging to investige failing tests on some build bots
........
r60570 | christian.heimes | 2008-02-04 20:30:05 +0100 (Mon, 04 Feb 2008) | 1 line
Small adjustments for test compact freelist test. It's no passing on Windows as well.
........
r60573 | amaury.forgeotdarc | 2008-02-04 21:53:14 +0100 (Mon, 04 Feb 2008) | 2 lines
Correct quotes in NEWS file
........
r60575 | amaury.forgeotdarc | 2008-02-04 22:45:05 +0100 (Mon, 04 Feb 2008) | 13 lines
#1750076: Debugger did not step on every iteration of a while statement.
The mapping between bytecode offsets and source lines (lnotab) did not contain
an entry for the beginning of the loop.
Now it does, and the lnotab can be a bit larger:
in particular, several statements on the same line generate several entries.
However, this does not bother the settrace function, which will trigger only
one 'line' event.
The lnotab seems to be exactly the same as with python2.4.
........
r60584 | amaury.forgeotdarc | 2008-02-05 01:26:21 +0100 (Tue, 05 Feb 2008) | 3 lines
Change r60575 broke test_compile:
there is no need to emit co_lnotab item when both offsets are zeros.
........
r60587 | skip.montanaro | 2008-02-05 03:32:16 +0100 (Tue, 05 Feb 2008) | 1 line
sync with most recent version from python-mode sf project
........
r60588 | lars.gustaebel | 2008-02-05 12:51:40 +0100 (Tue, 05 Feb 2008) | 5 lines
Issue #2004: Use mode 0700 for temporary directories and default
permissions for missing directories.
(will backport to 2.5)
........
r60590 | georg.brandl | 2008-02-05 13:01:24 +0100 (Tue, 05 Feb 2008) | 2 lines
Convert external links to internal links. Fixes #2010.
........
r60592 | marc-andre.lemburg | 2008-02-05 15:50:40 +0100 (Tue, 05 Feb 2008) | 3 lines
Keep distutils Python 2.1 compatible (or even Python 2.4 in this case).
........
r60593 | andrew.kuchling | 2008-02-05 17:06:57 +0100 (Tue, 05 Feb 2008) | 5 lines
Update PEP URL.
(This code is duplicated between pydoc and DocXMLRPCServer; maybe it
should be refactored as a GHOP project.)
2.5.2 backport candidate.
........
r60596 | guido.van.rossum | 2008-02-05 18:32:15 +0100 (Tue, 05 Feb 2008) | 2 lines
In the experimental 'Scanner' feature, the group count was set wrong.
........
r60602 | facundo.batista | 2008-02-05 20:03:32 +0100 (Tue, 05 Feb 2008) | 3 lines
Issue 1951. Converts wave test cases to unittest.
........
r60603 | georg.brandl | 2008-02-05 20:07:10 +0100 (Tue, 05 Feb 2008) | 2 lines
Actually run the test.
........
r60604 | skip.montanaro | 2008-02-05 20:24:30 +0100 (Tue, 05 Feb 2008) | 2 lines
correct object name
........
r60605 | georg.brandl | 2008-02-05 20:58:17 +0100 (Tue, 05 Feb 2008) | 7 lines
* Use the same code to profile for test_profile and test_cprofile.
* Convert both to unittest.
* Use the same unit testing code.
* Include the expected output in both test files.
* Make it possible to regenerate the expected output by running
the file as a script with an '-r' argument.
........
r60613 | raymond.hettinger | 2008-02-06 02:49:00 +0100 (Wed, 06 Feb 2008) | 1 line
Sync-up with Py3k work.
........
r60614 | christian.heimes | 2008-02-06 13:44:34 +0100 (Wed, 06 Feb 2008) | 1 line
Limit free list of method and builtin function objects to 256 entries each.
........
r60616 | christian.heimes | 2008-02-06 14:33:44 +0100 (Wed, 06 Feb 2008) | 7 lines
Unified naming convention for free lists and their limits. All free lists
in Object/ are named ``free_list``, the counter ``numfree`` and the upper
limit is a macro ``PyName_MAXFREELIST`` inside an #ifndef block.
The chances should make it easier to adjust Python for platforms with
less memory, e.g. mobile phones.
........
2008-02-06 22:31:34 +08:00
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2010-05-09 23:52:27 +08:00
|
|
|
if (size == 0) {
|
2020-06-08 08:14:47 +08:00
|
|
|
#ifdef Py_DEBUG
|
|
|
|
// PyTuple_New() must not be called after _PyTuple_Fini()
|
|
|
|
assert(state->numfree[0] != -1);
|
|
|
|
#endif
|
2020-06-05 05:38:36 +08:00
|
|
|
state->free_list[0] = op;
|
|
|
|
++state->numfree[0];
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_INCREF(op); /* extra INCREF so that this is never freed */
|
|
|
|
}
|
2009-03-24 03:19:54 +08:00
|
|
|
#endif
|
2019-08-14 22:10:33 +08:00
|
|
|
tuple_gc_track(op);
|
2010-05-09 23:52:27 +08:00
|
|
|
return (PyObject *) op;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2013-08-14 02:18:52 +08:00
|
|
|
PyTuple_Size(PyObject *op)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return Py_SIZE(op);
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
PyObject *
|
2013-08-14 02:18:52 +08:00
|
|
|
PyTuple_GetItem(PyObject *op, Py_ssize_t i)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (i < 0 || i >= Py_SIZE(op)) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "tuple index out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return ((PyTupleObject *)op) -> ob_item[i];
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2013-08-14 02:18:52 +08:00
|
|
|
PyTuple_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2013-08-14 02:18:52 +08:00
|
|
|
PyObject **p;
|
2020-02-07 07:38:59 +08:00
|
|
|
if (!PyTuple_Check(op) || Py_REFCNT(op) != 1) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(newitem);
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (i < 0 || i >= Py_SIZE(op)) {
|
|
|
|
Py_XDECREF(newitem);
|
|
|
|
PyErr_SetString(PyExc_IndexError,
|
|
|
|
"tuple assignment index out of range");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
p = ((PyTupleObject *)op) -> ob_item + i;
|
2016-04-06 14:50:03 +08:00
|
|
|
Py_XSETREF(*p, newitem);
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2009-03-24 02:52:06 +08:00
|
|
|
void
|
|
|
|
_PyTuple_MaybeUntrack(PyObject *op)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyTupleObject *t;
|
|
|
|
Py_ssize_t i, n;
|
|
|
|
|
|
|
|
if (!PyTuple_CheckExact(op) || !_PyObject_GC_IS_TRACKED(op))
|
|
|
|
return;
|
|
|
|
t = (PyTupleObject *) op;
|
|
|
|
n = Py_SIZE(t);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
PyObject *elt = PyTuple_GET_ITEM(t, i);
|
|
|
|
/* Tuple with NULL elements aren't
|
|
|
|
fully constructed, don't untrack
|
|
|
|
them yet. */
|
|
|
|
if (!elt ||
|
|
|
|
_PyObject_GC_MAY_BE_TRACKED(elt))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
_PyObject_GC_UNTRACK(op);
|
2009-03-24 02:52:06 +08:00
|
|
|
}
|
|
|
|
|
2003-10-13 02:24:34 +08:00
|
|
|
PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
PyTuple_Pack(Py_ssize_t n, ...)
|
2003-10-13 02:24:34 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i;
|
|
|
|
PyObject *o;
|
|
|
|
PyObject **items;
|
|
|
|
va_list vargs;
|
|
|
|
|
2019-08-14 22:10:33 +08:00
|
|
|
if (n == 0) {
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
va_start(vargs, n);
|
2020-06-05 05:38:36 +08:00
|
|
|
PyTupleObject *result = tuple_alloc(state, n);
|
2012-09-10 08:54:51 +08:00
|
|
|
if (result == NULL) {
|
|
|
|
va_end(vargs);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2012-09-10 08:54:51 +08:00
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
items = result->ob_item;
|
2010-05-09 23:52:27 +08:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
o = va_arg(vargs, PyObject *);
|
|
|
|
Py_INCREF(o);
|
|
|
|
items[i] = o;
|
|
|
|
}
|
|
|
|
va_end(vargs);
|
2019-08-14 22:10:33 +08:00
|
|
|
tuple_gc_track(result);
|
|
|
|
return (PyObject *)result;
|
2003-10-13 02:24:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1990-10-14 20:07:46 +08:00
|
|
|
/* Methods */
|
|
|
|
|
|
|
|
static void
|
2013-08-14 02:18:52 +08:00
|
|
|
tupledealloc(PyTupleObject *op)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2013-08-14 02:18:52 +08:00
|
|
|
Py_ssize_t len = Py_SIZE(op);
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject_GC_UnTrack(op);
|
2019-05-11 01:21:11 +08:00
|
|
|
Py_TRASHCAN_BEGIN(op, tupledealloc)
|
2010-05-09 23:52:27 +08:00
|
|
|
if (len > 0) {
|
2020-06-05 05:38:36 +08:00
|
|
|
Py_ssize_t i = len;
|
|
|
|
while (--i >= 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(op->ob_item[i]);
|
2020-06-05 05:38:36 +08:00
|
|
|
}
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60568 | christian.heimes | 2008-02-04 19:48:38 +0100 (Mon, 04 Feb 2008) | 1 line
Increase debugging to investige failing tests on some build bots
........
r60570 | christian.heimes | 2008-02-04 20:30:05 +0100 (Mon, 04 Feb 2008) | 1 line
Small adjustments for test compact freelist test. It's no passing on Windows as well.
........
r60573 | amaury.forgeotdarc | 2008-02-04 21:53:14 +0100 (Mon, 04 Feb 2008) | 2 lines
Correct quotes in NEWS file
........
r60575 | amaury.forgeotdarc | 2008-02-04 22:45:05 +0100 (Mon, 04 Feb 2008) | 13 lines
#1750076: Debugger did not step on every iteration of a while statement.
The mapping between bytecode offsets and source lines (lnotab) did not contain
an entry for the beginning of the loop.
Now it does, and the lnotab can be a bit larger:
in particular, several statements on the same line generate several entries.
However, this does not bother the settrace function, which will trigger only
one 'line' event.
The lnotab seems to be exactly the same as with python2.4.
........
r60584 | amaury.forgeotdarc | 2008-02-05 01:26:21 +0100 (Tue, 05 Feb 2008) | 3 lines
Change r60575 broke test_compile:
there is no need to emit co_lnotab item when both offsets are zeros.
........
r60587 | skip.montanaro | 2008-02-05 03:32:16 +0100 (Tue, 05 Feb 2008) | 1 line
sync with most recent version from python-mode sf project
........
r60588 | lars.gustaebel | 2008-02-05 12:51:40 +0100 (Tue, 05 Feb 2008) | 5 lines
Issue #2004: Use mode 0700 for temporary directories and default
permissions for missing directories.
(will backport to 2.5)
........
r60590 | georg.brandl | 2008-02-05 13:01:24 +0100 (Tue, 05 Feb 2008) | 2 lines
Convert external links to internal links. Fixes #2010.
........
r60592 | marc-andre.lemburg | 2008-02-05 15:50:40 +0100 (Tue, 05 Feb 2008) | 3 lines
Keep distutils Python 2.1 compatible (or even Python 2.4 in this case).
........
r60593 | andrew.kuchling | 2008-02-05 17:06:57 +0100 (Tue, 05 Feb 2008) | 5 lines
Update PEP URL.
(This code is duplicated between pydoc and DocXMLRPCServer; maybe it
should be refactored as a GHOP project.)
2.5.2 backport candidate.
........
r60596 | guido.van.rossum | 2008-02-05 18:32:15 +0100 (Tue, 05 Feb 2008) | 2 lines
In the experimental 'Scanner' feature, the group count was set wrong.
........
r60602 | facundo.batista | 2008-02-05 20:03:32 +0100 (Tue, 05 Feb 2008) | 3 lines
Issue 1951. Converts wave test cases to unittest.
........
r60603 | georg.brandl | 2008-02-05 20:07:10 +0100 (Tue, 05 Feb 2008) | 2 lines
Actually run the test.
........
r60604 | skip.montanaro | 2008-02-05 20:24:30 +0100 (Tue, 05 Feb 2008) | 2 lines
correct object name
........
r60605 | georg.brandl | 2008-02-05 20:58:17 +0100 (Tue, 05 Feb 2008) | 7 lines
* Use the same code to profile for test_profile and test_cprofile.
* Convert both to unittest.
* Use the same unit testing code.
* Include the expected output in both test files.
* Make it possible to regenerate the expected output by running
the file as a script with an '-r' argument.
........
r60613 | raymond.hettinger | 2008-02-06 02:49:00 +0100 (Wed, 06 Feb 2008) | 1 line
Sync-up with Py3k work.
........
r60614 | christian.heimes | 2008-02-06 13:44:34 +0100 (Wed, 06 Feb 2008) | 1 line
Limit free list of method and builtin function objects to 256 entries each.
........
r60616 | christian.heimes | 2008-02-06 14:33:44 +0100 (Wed, 06 Feb 2008) | 7 lines
Unified naming convention for free lists and their limits. All free lists
in Object/ are named ``free_list``, the counter ``numfree`` and the upper
limit is a macro ``PyName_MAXFREELIST`` inside an #ifndef block.
The chances should make it easier to adjust Python for platforms with
less memory, e.g. mobile phones.
........
2008-02-06 22:31:34 +08:00
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
2020-06-08 08:14:47 +08:00
|
|
|
#ifdef Py_DEBUG
|
|
|
|
// tupledealloc() must not be called after _PyTuple_Fini()
|
|
|
|
assert(state->numfree[0] != -1);
|
|
|
|
#endif
|
2010-05-09 23:52:27 +08:00
|
|
|
if (len < PyTuple_MAXSAVESIZE &&
|
2020-06-05 05:38:36 +08:00
|
|
|
state->numfree[len] < PyTuple_MAXFREELIST &&
|
2020-03-04 21:15:20 +08:00
|
|
|
Py_IS_TYPE(op, &PyTuple_Type))
|
2010-05-09 23:52:27 +08:00
|
|
|
{
|
2020-06-05 05:38:36 +08:00
|
|
|
op->ob_item[0] = (PyObject *) state->free_list[len];
|
|
|
|
state->numfree[len]++;
|
|
|
|
state->free_list[len] = op;
|
2010-05-09 23:52:27 +08:00
|
|
|
goto done; /* return */
|
|
|
|
}
|
1993-10-16 00:18:48 +08:00
|
|
|
#endif
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
Py_TYPE(op)->tp_free((PyObject *)op);
|
2020-05-06 01:55:29 +08:00
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2000-03-14 00:01:29 +08:00
|
|
|
done:
|
2020-05-06 01:55:29 +08:00
|
|
|
#endif
|
2019-05-11 01:21:11 +08:00
|
|
|
Py_TRASHCAN_END
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
static PyObject *
|
2000-07-09 15:04:36 +08:00
|
|
|
tuplerepr(PyTupleObject *v)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i, n;
|
2013-11-19 19:59:46 +08:00
|
|
|
_PyUnicodeWriter writer;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
n = Py_SIZE(v);
|
|
|
|
if (n == 0)
|
|
|
|
return PyUnicode_FromString("()");
|
|
|
|
|
|
|
|
/* While not mutable, it is still possible to end up with a cycle in a
|
|
|
|
tuple through an object that stores itself within a tuple (and thus
|
|
|
|
infinitely asks for the repr of itself). This should only be
|
|
|
|
possible within a type. */
|
|
|
|
i = Py_ReprEnter((PyObject *)v);
|
|
|
|
if (i != 0) {
|
|
|
|
return i > 0 ? PyUnicode_FromString("(...)") : NULL;
|
|
|
|
}
|
|
|
|
|
2013-11-19 19:59:46 +08:00
|
|
|
_PyUnicodeWriter_Init(&writer);
|
|
|
|
writer.overallocate = 1;
|
|
|
|
if (Py_SIZE(v) > 1) {
|
|
|
|
/* "(" + "1" + ", 2" * (len - 1) + ")" */
|
|
|
|
writer.min_length = 1 + 1 + (2 + 1) * (Py_SIZE(v) - 1) + 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* "(1,)" */
|
|
|
|
writer.min_length = 4;
|
|
|
|
}
|
2011-10-07 00:57:27 +08:00
|
|
|
|
2013-11-19 19:59:46 +08:00
|
|
|
if (_PyUnicodeWriter_WriteChar(&writer, '(') < 0)
|
2011-10-07 00:57:27 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
/* Do repr() on each element. */
|
|
|
|
for (i = 0; i < n; ++i) {
|
2013-11-19 19:59:46 +08:00
|
|
|
PyObject *s;
|
|
|
|
|
|
|
|
if (i > 0) {
|
|
|
|
if (_PyUnicodeWriter_WriteASCIIString(&writer, ", ", 2) < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
s = PyObject_Repr(v->ob_item[i]);
|
2013-11-19 19:59:46 +08:00
|
|
|
if (s == NULL)
|
2011-10-07 00:57:27 +08:00
|
|
|
goto error;
|
2013-11-19 19:59:46 +08:00
|
|
|
|
|
|
|
if (_PyUnicodeWriter_WriteStr(&writer, s) < 0) {
|
|
|
|
Py_DECREF(s);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
writer.overallocate = 0;
|
|
|
|
if (n > 1) {
|
|
|
|
if (_PyUnicodeWriter_WriteChar(&writer, ')') < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (_PyUnicodeWriter_WriteASCIIString(&writer, ",)", 2) < 0)
|
2011-10-07 00:57:27 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
2011-10-07 00:57:27 +08:00
|
|
|
Py_ReprLeave((PyObject *)v);
|
2013-11-19 19:59:46 +08:00
|
|
|
return _PyUnicodeWriter_Finish(&writer);
|
2001-06-16 13:11:17 +08:00
|
|
|
|
2011-10-07 00:57:27 +08:00
|
|
|
error:
|
2013-11-19 19:59:46 +08:00
|
|
|
_PyUnicodeWriter_Dealloc(&writer);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ReprLeave((PyObject *)v);
|
2011-10-07 00:57:27 +08:00
|
|
|
return NULL;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2004-06-04 14:35:20 +08:00
|
|
|
|
2018-10-28 08:06:38 +08:00
|
|
|
/* Hash for tuples. This is a slightly simplified version of the xxHash
|
|
|
|
non-cryptographic hash:
|
|
|
|
- we do not use any parallellism, there is only 1 accumulator.
|
|
|
|
- we drop the final mixing since this is just a permutation of the
|
|
|
|
output space: it does not help against collisions.
|
|
|
|
- at the end, we mangle the length with a single constant.
|
|
|
|
For the xxHash specification, see
|
|
|
|
https://github.com/Cyan4973/xxHash/blob/master/doc/xxhash_spec.md
|
|
|
|
|
|
|
|
Below are the official constants from the xxHash specification. Optimizing
|
|
|
|
compilers should emit a single "rotate" instruction for the
|
|
|
|
_PyHASH_XXROTATE() expansion. If that doesn't happen for some important
|
|
|
|
platform, the macro could be changed to expand to a platform-specific rotate
|
|
|
|
spelling instead.
|
2004-06-04 14:35:20 +08:00
|
|
|
*/
|
2018-10-28 08:06:38 +08:00
|
|
|
#if SIZEOF_PY_UHASH_T > 4
|
|
|
|
#define _PyHASH_XXPRIME_1 ((Py_uhash_t)11400714785074694791ULL)
|
|
|
|
#define _PyHASH_XXPRIME_2 ((Py_uhash_t)14029467366897019727ULL)
|
|
|
|
#define _PyHASH_XXPRIME_5 ((Py_uhash_t)2870177450012600261ULL)
|
|
|
|
#define _PyHASH_XXROTATE(x) ((x << 31) | (x >> 33)) /* Rotate left 31 bits */
|
|
|
|
#else
|
|
|
|
#define _PyHASH_XXPRIME_1 ((Py_uhash_t)2654435761UL)
|
|
|
|
#define _PyHASH_XXPRIME_2 ((Py_uhash_t)2246822519UL)
|
|
|
|
#define _PyHASH_XXPRIME_5 ((Py_uhash_t)374761393UL)
|
|
|
|
#define _PyHASH_XXROTATE(x) ((x << 13) | (x >> 19)) /* Rotate left 13 bits */
|
|
|
|
#endif
|
2004-06-04 14:35:20 +08:00
|
|
|
|
2018-10-28 08:06:38 +08:00
|
|
|
/* Tests have shown that it's not worth to cache the hash value, see
|
|
|
|
https://bugs.python.org/issue9685 */
|
2010-10-18 04:54:53 +08:00
|
|
|
static Py_hash_t
|
2000-07-09 15:04:36 +08:00
|
|
|
tuplehash(PyTupleObject *v)
|
1993-03-29 18:43:31 +08:00
|
|
|
{
|
2018-10-28 08:06:38 +08:00
|
|
|
Py_ssize_t i, len = Py_SIZE(v);
|
|
|
|
PyObject **item = v->ob_item;
|
|
|
|
|
|
|
|
Py_uhash_t acc = _PyHASH_XXPRIME_5;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
Py_uhash_t lane = PyObject_Hash(item[i]);
|
|
|
|
if (lane == (Py_uhash_t)-1) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2018-10-28 08:06:38 +08:00
|
|
|
}
|
|
|
|
acc += lane * _PyHASH_XXPRIME_2;
|
|
|
|
acc = _PyHASH_XXROTATE(acc);
|
|
|
|
acc *= _PyHASH_XXPRIME_1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add input length, mangled to keep the historical value of hash(()). */
|
|
|
|
acc += len ^ (_PyHASH_XXPRIME_5 ^ 3527539UL);
|
|
|
|
|
|
|
|
if (acc == (Py_uhash_t)-1) {
|
|
|
|
return 1546275796;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2018-10-28 08:06:38 +08:00
|
|
|
return acc;
|
1993-03-29 18:43:31 +08:00
|
|
|
}
|
|
|
|
|
2006-02-16 01:27:45 +08:00
|
|
|
static Py_ssize_t
|
2000-07-09 15:04:36 +08:00
|
|
|
tuplelength(PyTupleObject *a)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return Py_SIZE(a);
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2000-04-28 05:41:03 +08:00
|
|
|
static int
|
2000-07-09 15:04:36 +08:00
|
|
|
tuplecontains(PyTupleObject *a, PyObject *el)
|
2000-04-28 05:41:03 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i;
|
|
|
|
int cmp;
|
2000-04-28 05:41:03 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
|
2019-08-04 19:12:48 +08:00
|
|
|
cmp = PyObject_RichCompareBool(PyTuple_GET_ITEM(a, i), el, Py_EQ);
|
2010-05-09 23:52:27 +08:00
|
|
|
return cmp;
|
2000-04-28 05:41:03 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
static PyObject *
|
2013-08-14 02:18:52 +08:00
|
|
|
tupleitem(PyTupleObject *a, Py_ssize_t i)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (i < 0 || i >= Py_SIZE(a)) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "tuple index out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_INCREF(a->ob_item[i]);
|
|
|
|
return a->ob_item[i];
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2019-02-26 00:59:12 +08:00
|
|
|
PyObject *
|
|
|
|
_PyTuple_FromArray(PyObject *const *src, Py_ssize_t n)
|
|
|
|
{
|
2019-08-14 22:10:33 +08:00
|
|
|
if (n == 0) {
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
PyTupleObject *tuple = tuple_alloc(state, n);
|
2019-02-26 00:59:12 +08:00
|
|
|
if (tuple == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject **dst = tuple->ob_item;
|
|
|
|
for (Py_ssize_t i = 0; i < n; i++) {
|
|
|
|
PyObject *item = src[i];
|
|
|
|
Py_INCREF(item);
|
|
|
|
dst[i] = item;
|
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
tuple_gc_track(tuple);
|
2019-02-26 00:59:12 +08:00
|
|
|
return (PyObject *)tuple;
|
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
static PyObject *
|
2013-08-14 02:18:52 +08:00
|
|
|
tupleslice(PyTupleObject *a, Py_ssize_t ilow,
|
|
|
|
Py_ssize_t ihigh)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (ilow < 0)
|
|
|
|
ilow = 0;
|
|
|
|
if (ihigh > Py_SIZE(a))
|
|
|
|
ihigh = Py_SIZE(a);
|
|
|
|
if (ihigh < ilow)
|
|
|
|
ihigh = ilow;
|
|
|
|
if (ilow == 0 && ihigh == Py_SIZE(a) && PyTuple_CheckExact(a)) {
|
|
|
|
Py_INCREF(a);
|
|
|
|
return (PyObject *)a;
|
|
|
|
}
|
2019-02-26 00:59:12 +08:00
|
|
|
return _PyTuple_FromArray(a->ob_item + ilow, ihigh - ilow);
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
PyTuple_GetSlice(PyObject *op, Py_ssize_t i, Py_ssize_t j)
|
1992-01-15 02:45:33 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (op == NULL || !PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return tupleslice((PyTupleObject *)op, i, j);
|
1992-01-15 02:45:33 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
static PyObject *
|
2013-08-14 02:18:52 +08:00
|
|
|
tupleconcat(PyTupleObject *a, PyObject *bb)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2013-08-14 02:18:52 +08:00
|
|
|
Py_ssize_t size;
|
|
|
|
Py_ssize_t i;
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject **src, **dest;
|
|
|
|
PyTupleObject *np;
|
2017-03-07 05:39:35 +08:00
|
|
|
if (Py_SIZE(a) == 0 && PyTuple_CheckExact(bb)) {
|
|
|
|
Py_INCREF(bb);
|
|
|
|
return bb;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!PyTuple_Check(bb)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"can only concatenate tuple (not \"%.200s\") to tuple",
|
|
|
|
Py_TYPE(bb)->tp_name);
|
|
|
|
return NULL;
|
|
|
|
}
|
2020-06-05 05:38:36 +08:00
|
|
|
PyTupleObject *b = (PyTupleObject *)bb;
|
|
|
|
|
2017-03-07 05:39:35 +08:00
|
|
|
if (Py_SIZE(b) == 0 && PyTuple_CheckExact(a)) {
|
|
|
|
Py_INCREF(a);
|
|
|
|
return (PyObject *)a;
|
|
|
|
}
|
2020-05-25 22:54:40 +08:00
|
|
|
assert((size_t)Py_SIZE(a) + (size_t)Py_SIZE(b) < PY_SSIZE_T_MAX);
|
2016-07-25 10:39:20 +08:00
|
|
|
size = Py_SIZE(a) + Py_SIZE(b);
|
2019-08-14 22:10:33 +08:00
|
|
|
if (size == 0) {
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
np = tuple_alloc(state, size);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (np == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
src = a->ob_item;
|
|
|
|
dest = np->ob_item;
|
|
|
|
for (i = 0; i < Py_SIZE(a); i++) {
|
|
|
|
PyObject *v = src[i];
|
|
|
|
Py_INCREF(v);
|
|
|
|
dest[i] = v;
|
|
|
|
}
|
|
|
|
src = b->ob_item;
|
|
|
|
dest = np->ob_item + Py_SIZE(a);
|
|
|
|
for (i = 0; i < Py_SIZE(b); i++) {
|
|
|
|
PyObject *v = src[i];
|
|
|
|
Py_INCREF(v);
|
|
|
|
dest[i] = v;
|
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
tuple_gc_track(np);
|
2010-05-09 23:52:27 +08:00
|
|
|
return (PyObject *)np;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
static PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
tuplerepeat(PyTupleObject *a, Py_ssize_t n)
|
1991-06-05 04:35:24 +09:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i, j;
|
|
|
|
Py_ssize_t size;
|
|
|
|
PyTupleObject *np;
|
|
|
|
PyObject **p, **items;
|
|
|
|
if (Py_SIZE(a) == 0 || n == 1) {
|
|
|
|
if (PyTuple_CheckExact(a)) {
|
|
|
|
/* Since tuples are immutable, we can return a shared
|
|
|
|
copy in this case */
|
|
|
|
Py_INCREF(a);
|
|
|
|
return (PyObject *)a;
|
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
}
|
|
|
|
if (Py_SIZE(a) == 0 || n <= 0) {
|
|
|
|
return PyTuple_New(0);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-10-07 01:04:49 +08:00
|
|
|
if (n > PY_SSIZE_T_MAX / Py_SIZE(a))
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyErr_NoMemory();
|
2012-10-07 01:04:49 +08:00
|
|
|
size = Py_SIZE(a) * n;
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
np = tuple_alloc(state, size);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (np == NULL)
|
|
|
|
return NULL;
|
|
|
|
p = np->ob_item;
|
|
|
|
items = a->ob_item;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
for (j = 0; j < Py_SIZE(a); j++) {
|
|
|
|
*p = items[j];
|
|
|
|
Py_INCREF(*p);
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
2019-08-14 22:10:33 +08:00
|
|
|
tuple_gc_track(np);
|
2010-05-09 23:52:27 +08:00
|
|
|
return (PyObject *) np;
|
1991-06-05 04:35:24 +09:00
|
|
|
}
|
|
|
|
|
2017-03-19 14:47:58 +08:00
|
|
|
/*[clinic input]
|
|
|
|
tuple.index
|
|
|
|
|
|
|
|
value: object
|
2017-03-30 23:29:23 +08:00
|
|
|
start: slice_index(accept={int}) = 0
|
|
|
|
stop: slice_index(accept={int}, c_default="PY_SSIZE_T_MAX") = sys.maxsize
|
2017-03-19 14:47:58 +08:00
|
|
|
/
|
|
|
|
|
|
|
|
Return first index of value.
|
|
|
|
|
|
|
|
Raises ValueError if the value is not present.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-02-07 08:41:02 +08:00
|
|
|
static PyObject *
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple_index_impl(PyTupleObject *self, PyObject *value, Py_ssize_t start,
|
|
|
|
Py_ssize_t stop)
|
2017-03-30 23:29:23 +08:00
|
|
|
/*[clinic end generated code: output=07b6f9f3cb5c33eb input=fb39e9874a21fe3f]*/
|
2008-02-07 08:41:02 +08:00
|
|
|
{
|
2017-03-19 14:47:58 +08:00
|
|
|
Py_ssize_t i;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
if (start < 0) {
|
|
|
|
start += Py_SIZE(self);
|
|
|
|
if (start < 0)
|
|
|
|
start = 0;
|
|
|
|
}
|
|
|
|
if (stop < 0) {
|
|
|
|
stop += Py_SIZE(self);
|
|
|
|
}
|
2017-03-19 14:47:58 +08:00
|
|
|
else if (stop > Py_SIZE(self)) {
|
|
|
|
stop = Py_SIZE(self);
|
|
|
|
}
|
|
|
|
for (i = start; i < stop; i++) {
|
|
|
|
int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (cmp > 0)
|
|
|
|
return PyLong_FromSsize_t(i);
|
|
|
|
else if (cmp < 0)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyErr_SetString(PyExc_ValueError, "tuple.index(x): x not in tuple");
|
|
|
|
return NULL;
|
2008-02-07 08:41:02 +08:00
|
|
|
}
|
|
|
|
|
2017-03-19 14:47:58 +08:00
|
|
|
/*[clinic input]
|
|
|
|
tuple.count
|
|
|
|
|
|
|
|
value: object
|
|
|
|
/
|
|
|
|
|
|
|
|
Return number of occurrences of value.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-02-07 08:41:02 +08:00
|
|
|
static PyObject *
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple_count(PyTupleObject *self, PyObject *value)
|
|
|
|
/*[clinic end generated code: output=aa927affc5a97605 input=531721aff65bd772]*/
|
2008-02-07 08:41:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t count = 0;
|
|
|
|
Py_ssize_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < Py_SIZE(self); i++) {
|
2017-03-19 14:47:58 +08:00
|
|
|
int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (cmp > 0)
|
|
|
|
count++;
|
|
|
|
else if (cmp < 0)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyLong_FromSsize_t(count);
|
2008-02-07 08:41:02 +08:00
|
|
|
}
|
|
|
|
|
2000-06-23 22:18:11 +08:00
|
|
|
static int
|
|
|
|
tupletraverse(PyTupleObject *o, visitproc visit, void *arg)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i;
|
2006-04-21 18:40:58 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
for (i = Py_SIZE(o); --i >= 0; )
|
|
|
|
Py_VISIT(o->ob_item[i]);
|
|
|
|
return 0;
|
2000-06-23 22:18:11 +08:00
|
|
|
}
|
|
|
|
|
2001-01-18 08:00:53 +08:00
|
|
|
static PyObject *
|
|
|
|
tuplerichcompare(PyObject *v, PyObject *w, int op)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyTupleObject *vt, *wt;
|
|
|
|
Py_ssize_t i;
|
|
|
|
Py_ssize_t vlen, wlen;
|
|
|
|
|
2011-08-11 09:28:54 +08:00
|
|
|
if (!PyTuple_Check(v) || !PyTuple_Check(w))
|
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
vt = (PyTupleObject *)v;
|
|
|
|
wt = (PyTupleObject *)w;
|
|
|
|
|
|
|
|
vlen = Py_SIZE(vt);
|
|
|
|
wlen = Py_SIZE(wt);
|
|
|
|
|
|
|
|
/* Note: the corresponding code for lists has an "early out" test
|
|
|
|
* here when op is EQ or NE and the lengths differ. That pays there,
|
|
|
|
* but Tim was unable to find any real code where EQ/NE tuple
|
|
|
|
* compares don't have the same length, so testing for it here would
|
|
|
|
* have cost without benefit.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Search for the first index where items are different.
|
|
|
|
* Note that because tuples are immutable, it's safe to reuse
|
|
|
|
* vlen and wlen across the comparison calls.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < vlen && i < wlen; i++) {
|
|
|
|
int k = PyObject_RichCompareBool(vt->ob_item[i],
|
|
|
|
wt->ob_item[i], Py_EQ);
|
|
|
|
if (k < 0)
|
|
|
|
return NULL;
|
|
|
|
if (!k)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i >= vlen || i >= wlen) {
|
|
|
|
/* No more items to compare -- compare sizes */
|
2017-11-02 18:32:54 +08:00
|
|
|
Py_RETURN_RICHCOMPARE(vlen, wlen, op);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* We have an item that differs -- shortcuts for EQ/NE */
|
|
|
|
if (op == Py_EQ) {
|
2017-01-23 15:47:21 +08:00
|
|
|
Py_RETURN_FALSE;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
if (op == Py_NE) {
|
2017-01-23 15:47:21 +08:00
|
|
|
Py_RETURN_TRUE;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare the final item again using the proper operator */
|
|
|
|
return PyObject_RichCompare(vt->ob_item[i], wt->ob_item[i], op);
|
2001-01-18 08:00:53 +08:00
|
|
|
}
|
|
|
|
|
2002-07-18 00:30:39 +08:00
|
|
|
static PyObject *
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple_subtype_new(PyTypeObject *type, PyObject *iterable);
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
@classmethod
|
|
|
|
tuple.__new__ as tuple_new
|
|
|
|
iterable: object(c_default="NULL") = ()
|
|
|
|
/
|
|
|
|
|
|
|
|
Built-in immutable sequence.
|
|
|
|
|
|
|
|
If no argument is given, the constructor returns an empty tuple.
|
|
|
|
If iterable is specified the tuple is initialized from iterable's items.
|
|
|
|
|
|
|
|
If the argument is a tuple, the return value is the same object.
|
|
|
|
[clinic start generated code]*/
|
2001-08-30 11:11:59 +08:00
|
|
|
|
2001-08-02 12:15:00 +08:00
|
|
|
static PyObject *
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple_new_impl(PyTypeObject *type, PyObject *iterable)
|
|
|
|
/*[clinic end generated code: output=4546d9f0d469bce7 input=86963bcde633b5a2]*/
|
2001-08-02 12:15:00 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (type != &PyTuple_Type)
|
2017-03-19 14:47:58 +08:00
|
|
|
return tuple_subtype_new(type, iterable);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2017-03-19 14:47:58 +08:00
|
|
|
if (iterable == NULL)
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyTuple_New(0);
|
|
|
|
else
|
2017-03-19 14:47:58 +08:00
|
|
|
return PySequence_Tuple(iterable);
|
2001-08-02 12:15:00 +08:00
|
|
|
}
|
|
|
|
|
2020-03-13 21:57:00 +08:00
|
|
|
static PyObject *
|
|
|
|
tuple_vectorcall(PyObject *type, PyObject * const*args,
|
|
|
|
size_t nargsf, PyObject *kwnames)
|
|
|
|
{
|
2020-03-16 22:06:20 +08:00
|
|
|
if (!_PyArg_NoKwnames("tuple", kwnames)) {
|
2020-03-13 21:57:00 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2020-03-16 22:04:14 +08:00
|
|
|
|
2020-03-13 21:57:00 +08:00
|
|
|
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
|
2020-03-16 22:04:14 +08:00
|
|
|
if (!_PyArg_CheckPositional("tuple", nargs, 0, 1)) {
|
2020-03-13 21:57:00 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nargs) {
|
|
|
|
return tuple_new_impl((PyTypeObject *)type, args[0]);
|
|
|
|
}
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
|
2001-08-30 11:11:59 +08:00
|
|
|
static PyObject *
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple_subtype_new(PyTypeObject *type, PyObject *iterable)
|
2001-08-30 11:11:59 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *tmp, *newobj, *item;
|
|
|
|
Py_ssize_t i, n;
|
|
|
|
|
|
|
|
assert(PyType_IsSubtype(type, &PyTuple_Type));
|
2017-03-19 14:47:58 +08:00
|
|
|
tmp = tuple_new_impl(&PyTuple_Type, iterable);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyTuple_Check(tmp));
|
|
|
|
newobj = type->tp_alloc(type, n = PyTuple_GET_SIZE(tmp));
|
2020-03-16 03:37:49 +08:00
|
|
|
if (newobj == NULL) {
|
|
|
|
Py_DECREF(tmp);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2020-03-16 03:37:49 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
item = PyTuple_GET_ITEM(tmp, i);
|
|
|
|
Py_INCREF(item);
|
|
|
|
PyTuple_SET_ITEM(newobj, i, item);
|
|
|
|
}
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
return newobj;
|
2001-08-30 11:11:59 +08:00
|
|
|
}
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
static PySequenceMethods tuple_as_sequence = {
|
2010-05-09 23:52:27 +08:00
|
|
|
(lenfunc)tuplelength, /* sq_length */
|
|
|
|
(binaryfunc)tupleconcat, /* sq_concat */
|
|
|
|
(ssizeargfunc)tuplerepeat, /* sq_repeat */
|
|
|
|
(ssizeargfunc)tupleitem, /* sq_item */
|
|
|
|
0, /* sq_slice */
|
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
|
|
|
(objobjproc)tuplecontains, /* sq_contains */
|
1990-10-14 20:07:46 +08:00
|
|
|
};
|
|
|
|
|
2002-06-11 18:55:12 +08:00
|
|
|
static PyObject*
|
|
|
|
tuplesubscript(PyTupleObject* self, PyObject* item)
|
|
|
|
{
|
2020-04-08 08:01:56 +08:00
|
|
|
if (_PyIndex_Check(item)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
if (i < 0)
|
|
|
|
i += PyTuple_GET_SIZE(self);
|
|
|
|
return tupleitem(self, i);
|
|
|
|
}
|
|
|
|
else if (PySlice_Check(item)) {
|
2019-05-17 15:13:03 +08:00
|
|
|
Py_ssize_t start, stop, step, slicelength, i;
|
|
|
|
size_t cur;
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject* it;
|
|
|
|
PyObject **src, **dest;
|
|
|
|
|
2017-04-08 14:53:51 +08:00
|
|
|
if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2017-04-08 14:53:51 +08:00
|
|
|
slicelength = PySlice_AdjustIndices(PyTuple_GET_SIZE(self), &start,
|
|
|
|
&stop, step);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
if (slicelength <= 0) {
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
else if (start == 0 && step == 1 &&
|
|
|
|
slicelength == PyTuple_GET_SIZE(self) &&
|
|
|
|
PyTuple_CheckExact(self)) {
|
|
|
|
Py_INCREF(self);
|
|
|
|
return (PyObject *)self;
|
|
|
|
}
|
|
|
|
else {
|
2020-06-05 05:38:36 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
struct _Py_tuple_state *state = &interp->tuple;
|
|
|
|
PyTupleObject* result = tuple_alloc(state, slicelength);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!result) return NULL;
|
|
|
|
|
|
|
|
src = self->ob_item;
|
2019-08-14 22:10:33 +08:00
|
|
|
dest = result->ob_item;
|
2010-05-09 23:52:27 +08:00
|
|
|
for (cur = start, i = 0; i < slicelength;
|
|
|
|
cur += step, i++) {
|
|
|
|
it = src[cur];
|
|
|
|
Py_INCREF(it);
|
|
|
|
dest[i] = it;
|
|
|
|
}
|
|
|
|
|
2019-08-14 22:10:33 +08:00
|
|
|
tuple_gc_track(result);
|
|
|
|
return (PyObject *)result;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2014-08-02 13:30:37 +08:00
|
|
|
"tuple indices must be integers or slices, not %.200s",
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_TYPE(item)->tp_name);
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-06-11 18:55:12 +08:00
|
|
|
}
|
|
|
|
|
2017-03-19 14:47:58 +08:00
|
|
|
/*[clinic input]
|
|
|
|
tuple.__getnewargs__
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2003-01-30 01:58:45 +08:00
|
|
|
static PyObject *
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple___getnewargs___impl(PyTupleObject *self)
|
|
|
|
/*[clinic end generated code: output=25e06e3ee56027e2 input=1aeb4b286a21639a]*/
|
2003-01-30 01:58:45 +08:00
|
|
|
{
|
2017-03-19 14:47:58 +08:00
|
|
|
return Py_BuildValue("(N)", tupleslice(self, 0, Py_SIZE(self)));
|
2003-01-30 01:58:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef tuple_methods[] = {
|
2017-03-19 14:47:58 +08:00
|
|
|
TUPLE___GETNEWARGS___METHODDEF
|
|
|
|
TUPLE_INDEX_METHODDEF
|
|
|
|
TUPLE_COUNT_METHODDEF
|
2020-04-08 00:50:06 +08:00
|
|
|
{"__class_getitem__", (PyCFunction)Py_GenericAlias, METH_O|METH_CLASS, PyDoc_STR("See PEP 585")},
|
2010-05-09 23:52:27 +08:00
|
|
|
{NULL, NULL} /* sentinel */
|
2003-01-30 01:58:45 +08:00
|
|
|
};
|
|
|
|
|
2002-06-11 18:55:12 +08:00
|
|
|
static PyMappingMethods tuple_as_mapping = {
|
2010-05-09 23:52:27 +08:00
|
|
|
(lenfunc)tuplelength,
|
|
|
|
(binaryfunc)tuplesubscript,
|
|
|
|
0
|
2002-06-11 18:55:12 +08:00
|
|
|
};
|
|
|
|
|
2002-08-09 09:30:17 +08:00
|
|
|
static PyObject *tuple_iter(PyObject *seq);
|
|
|
|
|
1997-05-02 11:12:38 +08:00
|
|
|
PyTypeObject PyTuple_Type = {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"tuple",
|
|
|
|
sizeof(PyTupleObject) - sizeof(PyObject *),
|
|
|
|
sizeof(PyObject *),
|
|
|
|
(destructor)tupledealloc, /* tp_dealloc */
|
2019-05-31 10:13:39 +08:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 23:52:27 +08:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-31 10:13:39 +08:00
|
|
|
0, /* tp_as_async */
|
2010-05-09 23:52:27 +08:00
|
|
|
(reprfunc)tuplerepr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
&tuple_as_sequence, /* tp_as_sequence */
|
|
|
|
&tuple_as_mapping, /* tp_as_mapping */
|
|
|
|
(hashfunc)tuplehash, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
|
|
|
|
Py_TPFLAGS_BASETYPE | Py_TPFLAGS_TUPLE_SUBCLASS, /* tp_flags */
|
2017-03-19 14:47:58 +08:00
|
|
|
tuple_new__doc__, /* tp_doc */
|
2010-05-09 23:52:27 +08:00
|
|
|
(traverseproc)tupletraverse, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
tuplerichcompare, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
tuple_iter, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
tuple_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 */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
tuple_new, /* tp_new */
|
|
|
|
PyObject_GC_Del, /* tp_free */
|
2020-03-13 21:57:00 +08:00
|
|
|
.tp_vectorcall = tuple_vectorcall,
|
1990-10-14 20:07:46 +08:00
|
|
|
};
|
1993-10-27 01:58:25 +08:00
|
|
|
|
|
|
|
/* The following function breaks the notion that tuples are immutable:
|
|
|
|
it changes the size of a tuple. We get away with this only if there
|
|
|
|
is only one module referencing the object. You can also think of it
|
2000-10-06 03:36:49 +08:00
|
|
|
as creating a new tuple object and destroying the old one, only more
|
|
|
|
efficiently. In any case, don't use this if the tuple may already be
|
2001-05-29 06:30:08 +08:00
|
|
|
known to some other part of the code. */
|
1993-10-27 01:58:25 +08:00
|
|
|
|
|
|
|
int
|
2006-02-16 01:27:45 +08:00
|
|
|
_PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
|
1993-10-27 01:58:25 +08:00
|
|
|
{
|
2013-08-14 02:18:52 +08:00
|
|
|
PyTupleObject *v;
|
|
|
|
PyTupleObject *sv;
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i;
|
|
|
|
Py_ssize_t oldsize;
|
|
|
|
|
|
|
|
v = (PyTupleObject *) *pv;
|
2020-03-07 06:53:17 +08:00
|
|
|
if (v == NULL || !Py_IS_TYPE(v, &PyTuple_Type) ||
|
2010-05-09 23:52:27 +08:00
|
|
|
(Py_SIZE(v) != 0 && Py_REFCNT(v) != 1)) {
|
|
|
|
*pv = 0;
|
|
|
|
Py_XDECREF(v);
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
oldsize = Py_SIZE(v);
|
|
|
|
if (oldsize == newsize)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (oldsize == 0) {
|
|
|
|
/* Empty tuples are often shared, so we should never
|
|
|
|
resize them in-place even if we do own the only
|
|
|
|
(current) reference */
|
|
|
|
Py_DECREF(v);
|
|
|
|
*pv = PyTuple_New(newsize);
|
|
|
|
return *pv == NULL ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX UNREF/NEWREF interface should be more symmetrical */
|
2020-02-04 00:55:05 +08:00
|
|
|
#ifdef Py_REF_DEBUG
|
|
|
|
_Py_RefTotal--;
|
|
|
|
#endif
|
|
|
|
if (_PyObject_GC_IS_TRACKED(v)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
_PyObject_GC_UNTRACK(v);
|
2020-02-04 00:55:05 +08:00
|
|
|
}
|
|
|
|
#ifdef Py_TRACE_REFS
|
2010-05-09 23:52:27 +08:00
|
|
|
_Py_ForgetReference((PyObject *) v);
|
2020-02-04 00:55:05 +08:00
|
|
|
#endif
|
2010-05-09 23:52:27 +08:00
|
|
|
/* DECREF items deleted by shrinkage */
|
|
|
|
for (i = newsize; i < oldsize; i++) {
|
2014-02-09 19:33:53 +08:00
|
|
|
Py_CLEAR(v->ob_item[i]);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
|
|
|
|
if (sv == NULL) {
|
|
|
|
*pv = NULL;
|
|
|
|
PyObject_GC_Del(v);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
_Py_NewReference((PyObject *) sv);
|
|
|
|
/* Zero out items added by growing */
|
|
|
|
if (newsize > oldsize)
|
|
|
|
memset(&sv->ob_item[oldsize], 0,
|
|
|
|
sizeof(*sv->ob_item) * (newsize - oldsize));
|
|
|
|
*pv = (PyObject *) sv;
|
|
|
|
_PyObject_GC_TRACK(sv);
|
|
|
|
return 0;
|
1993-10-27 01:58:25 +08:00
|
|
|
}
|
1997-08-05 10:16:08 +08:00
|
|
|
|
2020-04-29 08:29:20 +08:00
|
|
|
void
|
2020-06-05 05:38:36 +08:00
|
|
|
_PyTuple_ClearFreeList(PyThreadState *tstate)
|
1997-08-05 10:16:08 +08:00
|
|
|
{
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60568 | christian.heimes | 2008-02-04 19:48:38 +0100 (Mon, 04 Feb 2008) | 1 line
Increase debugging to investige failing tests on some build bots
........
r60570 | christian.heimes | 2008-02-04 20:30:05 +0100 (Mon, 04 Feb 2008) | 1 line
Small adjustments for test compact freelist test. It's no passing on Windows as well.
........
r60573 | amaury.forgeotdarc | 2008-02-04 21:53:14 +0100 (Mon, 04 Feb 2008) | 2 lines
Correct quotes in NEWS file
........
r60575 | amaury.forgeotdarc | 2008-02-04 22:45:05 +0100 (Mon, 04 Feb 2008) | 13 lines
#1750076: Debugger did not step on every iteration of a while statement.
The mapping between bytecode offsets and source lines (lnotab) did not contain
an entry for the beginning of the loop.
Now it does, and the lnotab can be a bit larger:
in particular, several statements on the same line generate several entries.
However, this does not bother the settrace function, which will trigger only
one 'line' event.
The lnotab seems to be exactly the same as with python2.4.
........
r60584 | amaury.forgeotdarc | 2008-02-05 01:26:21 +0100 (Tue, 05 Feb 2008) | 3 lines
Change r60575 broke test_compile:
there is no need to emit co_lnotab item when both offsets are zeros.
........
r60587 | skip.montanaro | 2008-02-05 03:32:16 +0100 (Tue, 05 Feb 2008) | 1 line
sync with most recent version from python-mode sf project
........
r60588 | lars.gustaebel | 2008-02-05 12:51:40 +0100 (Tue, 05 Feb 2008) | 5 lines
Issue #2004: Use mode 0700 for temporary directories and default
permissions for missing directories.
(will backport to 2.5)
........
r60590 | georg.brandl | 2008-02-05 13:01:24 +0100 (Tue, 05 Feb 2008) | 2 lines
Convert external links to internal links. Fixes #2010.
........
r60592 | marc-andre.lemburg | 2008-02-05 15:50:40 +0100 (Tue, 05 Feb 2008) | 3 lines
Keep distutils Python 2.1 compatible (or even Python 2.4 in this case).
........
r60593 | andrew.kuchling | 2008-02-05 17:06:57 +0100 (Tue, 05 Feb 2008) | 5 lines
Update PEP URL.
(This code is duplicated between pydoc and DocXMLRPCServer; maybe it
should be refactored as a GHOP project.)
2.5.2 backport candidate.
........
r60596 | guido.van.rossum | 2008-02-05 18:32:15 +0100 (Tue, 05 Feb 2008) | 2 lines
In the experimental 'Scanner' feature, the group count was set wrong.
........
r60602 | facundo.batista | 2008-02-05 20:03:32 +0100 (Tue, 05 Feb 2008) | 3 lines
Issue 1951. Converts wave test cases to unittest.
........
r60603 | georg.brandl | 2008-02-05 20:07:10 +0100 (Tue, 05 Feb 2008) | 2 lines
Actually run the test.
........
r60604 | skip.montanaro | 2008-02-05 20:24:30 +0100 (Tue, 05 Feb 2008) | 2 lines
correct object name
........
r60605 | georg.brandl | 2008-02-05 20:58:17 +0100 (Tue, 05 Feb 2008) | 7 lines
* Use the same code to profile for test_profile and test_cprofile.
* Convert both to unittest.
* Use the same unit testing code.
* Include the expected output in both test files.
* Make it possible to regenerate the expected output by running
the file as a script with an '-r' argument.
........
r60613 | raymond.hettinger | 2008-02-06 02:49:00 +0100 (Wed, 06 Feb 2008) | 1 line
Sync-up with Py3k work.
........
r60614 | christian.heimes | 2008-02-06 13:44:34 +0100 (Wed, 06 Feb 2008) | 1 line
Limit free list of method and builtin function objects to 256 entries each.
........
r60616 | christian.heimes | 2008-02-06 14:33:44 +0100 (Wed, 06 Feb 2008) | 7 lines
Unified naming convention for free lists and their limits. All free lists
in Object/ are named ``free_list``, the counter ``numfree`` and the upper
limit is a macro ``PyName_MAXFREELIST`` inside an #ifndef block.
The chances should make it easier to adjust Python for platforms with
less memory, e.g. mobile phones.
........
2008-02-06 22:31:34 +08:00
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2020-06-05 05:38:36 +08:00
|
|
|
struct _Py_tuple_state *state = &tstate->interp->tuple;
|
2020-04-29 08:29:20 +08:00
|
|
|
for (Py_ssize_t i = 1; i < PyTuple_MAXSAVESIZE; i++) {
|
2020-06-05 05:38:36 +08:00
|
|
|
PyTupleObject *p = state->free_list[i];
|
|
|
|
state->free_list[i] = NULL;
|
|
|
|
state->numfree[i] = 0;
|
2010-05-09 23:52:27 +08:00
|
|
|
while (p) {
|
2020-04-29 08:29:20 +08:00
|
|
|
PyTupleObject *q = p;
|
2010-05-09 23:52:27 +08:00
|
|
|
p = (PyTupleObject *)(p->ob_item[0]);
|
|
|
|
PyObject_GC_Del(q);
|
|
|
|
}
|
|
|
|
}
|
2020-04-29 08:29:20 +08:00
|
|
|
// the empty tuple singleton is only cleared by _PyTuple_Fini()
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines
Add diagnostic message to help figure-out why SocketServer tests occasionally crash
when trying to remove a pid that in not in the activechildren list.
........
r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line
Add fixed-point examples to the decimal FAQ
........
r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line
Improve rst markup
........
r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line
Show how to remove exponents.
........
r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup.
........
r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
........
r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line
Simplify moneyfmt() recipe.
........
r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup
........
r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line
No need to register subclass of ABCs.
........
r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line
Try to correct a markup error that does hide the following paragraph.
........
r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line
Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115
........
r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line
Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them.
........
r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines
Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ
Thanks to Thomas Herve for the fix.
........
r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line
In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
........
r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines
Two new functions:
* place_summary_first copies the regrtest summary to the front of the file
making it easier to scan quickly for problems.
* count_failures gets the actual count of the number of failing tests, not
just a 1 (some failures) or 0 (no failures).
........
r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line
Update example to match the current syntax.
........
r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines
Issue #2115: __slot__ attributes setting was 10x slower.
Also correct a possible crash using ABCs.
This change is exactly the same as an optimisation
done 5 years ago, but on slot *access*:
http://svn.python.org/view?view=rev&rev=28297
........
r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines
Temporarily let these tests pass
........
r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
........
r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines
Configured selection highlighting colors were ignored; updating highlighting
in the config dialog would cause non-Python files to be colored as if they
were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat.
........
r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines
Re-enable tests, they were failing since gc.collect() clears the various freelists.
They still remain fragile.
For example, a call to assertEqual currently does not make any allocation
(which surprised me at first).
But this can change when gc.collect also deletes the numerous "zombie frames"
attached to each function.
........
2008-02-16 15:38:31 +08:00
|
|
|
#endif
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines
Add diagnostic message to help figure-out why SocketServer tests occasionally crash
when trying to remove a pid that in not in the activechildren list.
........
r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line
Add fixed-point examples to the decimal FAQ
........
r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line
Improve rst markup
........
r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line
Show how to remove exponents.
........
r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup.
........
r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
........
r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line
Simplify moneyfmt() recipe.
........
r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup
........
r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line
No need to register subclass of ABCs.
........
r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line
Try to correct a markup error that does hide the following paragraph.
........
r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line
Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115
........
r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line
Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them.
........
r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines
Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ
Thanks to Thomas Herve for the fix.
........
r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line
In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
........
r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines
Two new functions:
* place_summary_first copies the regrtest summary to the front of the file
making it easier to scan quickly for problems.
* count_failures gets the actual count of the number of failing tests, not
just a 1 (some failures) or 0 (no failures).
........
r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line
Update example to match the current syntax.
........
r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines
Issue #2115: __slot__ attributes setting was 10x slower.
Also correct a possible crash using ABCs.
This change is exactly the same as an optimisation
done 5 years ago, but on slot *access*:
http://svn.python.org/view?view=rev&rev=28297
........
r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines
Temporarily let these tests pass
........
r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
........
r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines
Configured selection highlighting colors were ignored; updating highlighting
in the config dialog would cause non-Python files to be colored as if they
were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat.
........
r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines
Re-enable tests, they were failing since gc.collect() clears the various freelists.
They still remain fragile.
For example, a call to assertEqual currently does not make any allocation
(which surprised me at first).
But this can change when gc.collect also deletes the numerous "zombie frames"
attached to each function.
........
2008-02-16 15:38:31 +08:00
|
|
|
void
|
2020-06-05 05:38:36 +08:00
|
|
|
_PyTuple_Fini(PyThreadState *tstate)
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines
Add diagnostic message to help figure-out why SocketServer tests occasionally crash
when trying to remove a pid that in not in the activechildren list.
........
r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line
Add fixed-point examples to the decimal FAQ
........
r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line
Improve rst markup
........
r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line
Show how to remove exponents.
........
r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup.
........
r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
........
r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line
Simplify moneyfmt() recipe.
........
r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup
........
r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line
No need to register subclass of ABCs.
........
r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line
Try to correct a markup error that does hide the following paragraph.
........
r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line
Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115
........
r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line
Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them.
........
r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines
Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ
Thanks to Thomas Herve for the fix.
........
r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line
In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
........
r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines
Two new functions:
* place_summary_first copies the regrtest summary to the front of the file
making it easier to scan quickly for problems.
* count_failures gets the actual count of the number of failing tests, not
just a 1 (some failures) or 0 (no failures).
........
r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line
Update example to match the current syntax.
........
r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines
Issue #2115: __slot__ attributes setting was 10x slower.
Also correct a possible crash using ABCs.
This change is exactly the same as an optimisation
done 5 years ago, but on slot *access*:
http://svn.python.org/view?view=rev&rev=28297
........
r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines
Temporarily let these tests pass
........
r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
........
r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines
Configured selection highlighting colors were ignored; updating highlighting
in the config dialog would cause non-Python files to be colored as if they
were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat.
........
r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines
Re-enable tests, they were failing since gc.collect() clears the various freelists.
They still remain fragile.
For example, a call to assertEqual currently does not make any allocation
(which surprised me at first).
But this can change when gc.collect also deletes the numerous "zombie frames"
attached to each function.
........
2008-02-16 15:38:31 +08:00
|
|
|
{
|
|
|
|
#if PyTuple_MAXSAVESIZE > 0
|
2020-06-05 05:38:36 +08:00
|
|
|
struct _Py_tuple_state *state = &tstate->interp->tuple;
|
2010-05-09 23:52:27 +08:00
|
|
|
/* empty tuples are used all over the place and applications may
|
|
|
|
* rely on the fact that an empty tuple is a singleton. */
|
2020-06-05 05:38:36 +08:00
|
|
|
Py_CLEAR(state->free_list[0]);
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines
Add diagnostic message to help figure-out why SocketServer tests occasionally crash
when trying to remove a pid that in not in the activechildren list.
........
r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line
Add fixed-point examples to the decimal FAQ
........
r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line
Improve rst markup
........
r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line
Show how to remove exponents.
........
r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup.
........
r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
........
r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line
Simplify moneyfmt() recipe.
........
r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup
........
r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line
No need to register subclass of ABCs.
........
r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line
Try to correct a markup error that does hide the following paragraph.
........
r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line
Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115
........
r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line
Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them.
........
r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines
Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ
Thanks to Thomas Herve for the fix.
........
r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line
In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
........
r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines
Two new functions:
* place_summary_first copies the regrtest summary to the front of the file
making it easier to scan quickly for problems.
* count_failures gets the actual count of the number of failing tests, not
just a 1 (some failures) or 0 (no failures).
........
r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line
Update example to match the current syntax.
........
r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines
Issue #2115: __slot__ attributes setting was 10x slower.
Also correct a possible crash using ABCs.
This change is exactly the same as an optimisation
done 5 years ago, but on slot *access*:
http://svn.python.org/view?view=rev&rev=28297
........
r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines
Temporarily let these tests pass
........
r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
........
r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines
Configured selection highlighting colors were ignored; updating highlighting
in the config dialog would cause non-Python files to be colored as if they
were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat.
........
r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines
Re-enable tests, they were failing since gc.collect() clears the various freelists.
They still remain fragile.
For example, a call to assertEqual currently does not make any allocation
(which surprised me at first).
But this can change when gc.collect also deletes the numerous "zombie frames"
attached to each function.
........
2008-02-16 15:38:31 +08:00
|
|
|
|
2020-06-05 05:38:36 +08:00
|
|
|
_PyTuple_ClearFreeList(tstate);
|
2020-06-08 08:14:47 +08:00
|
|
|
#ifdef Py_DEBUG
|
|
|
|
state->numfree[0] = -1;
|
|
|
|
#endif
|
1997-08-05 10:16:08 +08:00
|
|
|
#endif
|
|
|
|
}
|
2002-08-09 09:30:17 +08:00
|
|
|
|
|
|
|
/*********************** Tuple Iterator **************************/
|
|
|
|
|
|
|
|
typedef struct {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject_HEAD
|
2013-06-05 06:11:34 +08:00
|
|
|
Py_ssize_t it_index;
|
2010-05-09 23:52:27 +08:00
|
|
|
PyTupleObject *it_seq; /* Set to NULL when iterator is exhausted */
|
2002-08-09 09:30:17 +08:00
|
|
|
} tupleiterobject;
|
|
|
|
|
|
|
|
static void
|
|
|
|
tupleiter_dealloc(tupleiterobject *it)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
_PyObject_GC_UNTRACK(it);
|
|
|
|
Py_XDECREF(it->it_seq);
|
|
|
|
PyObject_GC_Del(it);
|
2002-08-09 09:30:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
tupleiter_traverse(tupleiterobject *it, visitproc visit, void *arg)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_VISIT(it->it_seq);
|
|
|
|
return 0;
|
2002-08-09 09:30:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tupleiter_next(tupleiterobject *it)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyTupleObject *seq;
|
|
|
|
PyObject *item;
|
|
|
|
|
|
|
|
assert(it != NULL);
|
|
|
|
seq = it->it_seq;
|
|
|
|
if (seq == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyTuple_Check(seq));
|
|
|
|
|
|
|
|
if (it->it_index < PyTuple_GET_SIZE(seq)) {
|
|
|
|
item = PyTuple_GET_ITEM(seq, it->it_index);
|
|
|
|
++it->it_index;
|
|
|
|
Py_INCREF(item);
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
it->it_seq = NULL;
|
Issue #26494: Fixed crash on iterating exhausting iterators.
Affected classes are generic sequence iterators, iterators of str, bytes,
bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding
views and os.scandir() iterator.
2016-03-31 01:40:02 +08:00
|
|
|
Py_DECREF(seq);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2002-08-09 09:30:17 +08:00
|
|
|
}
|
|
|
|
|
2005-09-25 05:23:05 +08:00
|
|
|
static PyObject *
|
2018-04-30 02:59:33 +08:00
|
|
|
tupleiter_len(tupleiterobject *it, PyObject *Py_UNUSED(ignored))
|
2004-03-19 06:43:10 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t len = 0;
|
|
|
|
if (it->it_seq)
|
|
|
|
len = PyTuple_GET_SIZE(it->it_seq) - it->it_index;
|
|
|
|
return PyLong_FromSsize_t(len);
|
2004-03-19 06:43:10 +08:00
|
|
|
}
|
|
|
|
|
2006-02-12 05:32:43 +08:00
|
|
|
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
|
2005-09-25 05:23:05 +08:00
|
|
|
|
2012-04-03 18:49:41 +08:00
|
|
|
static PyObject *
|
2018-04-30 02:59:33 +08:00
|
|
|
tupleiter_reduce(tupleiterobject *it, PyObject *Py_UNUSED(ignored))
|
2012-04-03 18:49:41 +08:00
|
|
|
{
|
2018-12-11 14:28:18 +08:00
|
|
|
_Py_IDENTIFIER(iter);
|
2012-04-03 18:49:41 +08:00
|
|
|
if (it->it_seq)
|
2018-12-11 14:28:18 +08:00
|
|
|
return Py_BuildValue("N(O)n", _PyEval_GetBuiltinId(&PyId_iter),
|
2012-04-03 18:49:41 +08:00
|
|
|
it->it_seq, it->it_index);
|
|
|
|
else
|
2018-12-11 14:28:18 +08:00
|
|
|
return Py_BuildValue("N(())", _PyEval_GetBuiltinId(&PyId_iter));
|
2012-04-03 18:49:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tupleiter_setstate(tupleiterobject *it, PyObject *state)
|
|
|
|
{
|
2013-06-25 05:59:24 +08:00
|
|
|
Py_ssize_t index = PyLong_AsSsize_t(state);
|
2012-04-03 18:49:41 +08:00
|
|
|
if (index == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
if (it->it_seq != NULL) {
|
|
|
|
if (index < 0)
|
|
|
|
index = 0;
|
2014-03-05 21:47:57 +08:00
|
|
|
else if (index > PyTuple_GET_SIZE(it->it_seq))
|
|
|
|
index = PyTuple_GET_SIZE(it->it_seq); /* exhausted iterator */
|
2012-04-03 18:49:41 +08:00
|
|
|
it->it_index = index;
|
|
|
|
}
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
|
|
|
|
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");
|
|
|
|
|
2005-09-25 05:23:05 +08:00
|
|
|
static PyMethodDef tupleiter_methods[] = {
|
2010-05-09 23:52:27 +08:00
|
|
|
{"__length_hint__", (PyCFunction)tupleiter_len, METH_NOARGS, length_hint_doc},
|
2012-04-03 18:49:41 +08:00
|
|
|
{"__reduce__", (PyCFunction)tupleiter_reduce, METH_NOARGS, reduce_doc},
|
|
|
|
{"__setstate__", (PyCFunction)tupleiter_setstate, METH_O, setstate_doc},
|
2010-05-09 23:52:27 +08:00
|
|
|
{NULL, NULL} /* sentinel */
|
2004-03-19 06:43:10 +08:00
|
|
|
};
|
|
|
|
|
2002-08-09 09:30:17 +08:00
|
|
|
PyTypeObject PyTupleIter_Type = {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"tuple_iterator", /* tp_name */
|
|
|
|
sizeof(tupleiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)tupleiter_dealloc, /* tp_dealloc */
|
2019-05-31 10:13:39 +08:00
|
|
|
0, /* tp_vectorcall_offset */
|
2010-05-09 23:52:27 +08:00
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2019-05-31 10:13:39 +08:00
|
|
|
0, /* tp_as_async */
|
2010-05-09 23:52:27 +08:00
|
|
|
0, /* 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_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
|
|
|
(traverseproc)tupleiter_traverse, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
|
|
|
(iternextfunc)tupleiter_next, /* tp_iternext */
|
|
|
|
tupleiter_methods, /* tp_methods */
|
|
|
|
0,
|
2002-08-09 09:30:17 +08:00
|
|
|
};
|
2006-04-21 18:40:58 +08:00
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tuple_iter(PyObject *seq)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
tupleiterobject *it;
|
|
|
|
|
|
|
|
if (!PyTuple_Check(seq)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
it = PyObject_GC_New(tupleiterobject, &PyTupleIter_Type);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
it->it_index = 0;
|
|
|
|
Py_INCREF(seq);
|
|
|
|
it->it_seq = (PyTupleObject *)seq;
|
|
|
|
_PyObject_GC_TRACK(it);
|
|
|
|
return (PyObject *)it;
|
2006-04-21 18:40:58 +08:00
|
|
|
}
|