mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Cruft cleanup: Removed the unused last_is_sticky argument from the internal

Browse source 
_PyTuple_Resize().
This commit is contained in:
Tim Peters 2001-05-28 22:30:08 +00:00
parent 6a922372ad
commit 4324aa3572
6 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/tupleobject.h
View file

@ -33,7 +33,7 @@ extern DL_IMPORT(int) PyTuple_Size(PyObject *);
extern DL_IMPORT(PyObject *) PyTuple_GetItem(PyObject *, int); extern DL_IMPORT(PyObject *) PyTuple_GetItem(PyObject *, int);
extern DL_IMPORT(int) PyTuple_SetItem(PyObject *, int, PyObject *); extern DL_IMPORT(int) PyTuple_SetItem(PyObject *, int, PyObject *);
extern DL_IMPORT(PyObject *) PyTuple_GetSlice(PyObject *, int, int); extern DL_IMPORT(PyObject *) PyTuple_GetSlice(PyObject *, int, int);
extern DL_IMPORT(int) _PyTuple_Resize(PyObject **, int, int); extern DL_IMPORT(int) _PyTuple_Resize(PyObject **, int);
/* Macro, trading safety for speed */ /* Macro, trading safety for speed */
#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i]) #define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i])

6
Misc/NEWS
View file

@ -155,6 +155,12 @@ New platforms
- Python should compile and run out of the box using the Borland C - Python should compile and run out of the box using the Borland C
compiler (under Windows), thanks to Stephen Hansen. compiler (under Windows), thanks to Stephen Hansen.
C API
- Removed the unused last_is_sticky argument from the internal
_PyTuple_Resize(). If this affects you, you were cheating.
What's New in Python 2.1 (final)? What's New in Python 2.1 (final)?
================================= =================================

4
Modules/_tkinter.c
View file

@ -1851,7 +1851,7 @@ _bump(FlattenContext* context, int size)
context->maxsize = maxsize; context->maxsize = maxsize;
return _PyTuple_Resize(&context->tuple, maxsize, 0) >= 0; return _PyTuple_Resize(&context->tuple, maxsize) >= 0;
} }
static int static int
@ -1935,7 +1935,7 @@ Tkinter_Flatten(PyObject* self, PyObject* args)
if (!_flatten1(&context, item,0)) if (!_flatten1(&context, item,0))
return NULL; return NULL;
if (_PyTuple_Resize(&context.tuple, context.size, 0)) if (_PyTuple_Resize(&context.tuple, context.size))
return NULL; return NULL;
return context.tuple; return context.tuple;

4
Objects/abstract.c
View file

@ -1220,7 +1220,7 @@ PySequence_Tuple(PyObject *v)
n += 10; n += 10;
else else
n += 100; n += 100;
if (_PyTuple_Resize(&result, n, 0) != 0) { if (_PyTuple_Resize(&result, n) != 0) {
Py_DECREF(item); Py_DECREF(item);
goto Fail; goto Fail;
} }
@ -1230,7 +1230,7 @@ PySequence_Tuple(PyObject *v)
/* Cut tuple back if guess was too large. */ /* Cut tuple back if guess was too large. */
if (j < n && if (j < n &&
_PyTuple_Resize(&result, j, 0) != 0) _PyTuple_Resize(&result, j) != 0)
goto Fail; goto Fail;
Py_DECREF(it); Py_DECREF(it);

7
Objects/tupleobject.c
View file

@ -488,11 +488,10 @@ PyTypeObject PyTuple_Type = {
is only one module referencing the object. You can also think of it is only one module referencing the object. You can also think of it
as creating a new tuple object and destroying the old one, only more 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 efficiently. In any case, don't use this if the tuple may already be
known to some other part of the code. The last_is_sticky is not used known to some other part of the code. */
and must always be false. */
int int
_PyTuple_Resize(PyObject **pv, int newsize, int last_is_sticky) _PyTuple_Resize(PyObject **pv, int newsize)
{ {
register PyTupleObject *v; register PyTupleObject *v;
register PyTupleObject *sv; register PyTupleObject *sv;
@ -500,7 +499,7 @@ _PyTuple_Resize(PyObject **pv, int newsize, int last_is_sticky)
int sizediff; int sizediff;
v = (PyTupleObject *) *pv; v = (PyTupleObject *) *pv;
if (v == NULL || !PyTuple_Check(v) || last_is_sticky || if (v == NULL || !PyTuple_Check(v) ||
(v->ob_size != 0 && v->ob_refcnt != 1)) { (v->ob_size != 0 && v->ob_refcnt != 1)) {
*pv = 0; *pv = 0;
Py_XDECREF(v); Py_XDECREF(v);

2
Python/bltinmodule.c
View file

@ -2329,7 +2329,7 @@ filtertuple(PyObject *func, PyObject *tuple)
} }
} }
if (_PyTuple_Resize(&result, j, 0) < 0) if (_PyTuple_Resize(&result, j) < 0)
return NULL; return NULL;
return result; return result;