1993-07-28 06:05:47 -03:00
|
|
|
#ifndef Py_OBJECT_H
|
|
|
|
#define Py_OBJECT_H
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
|
|
|
|
1991-02-19 08:39:46 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Object and type object interface */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Objects are structures allocated on the heap. Special rules apply to
|
|
|
|
the use of objects to ensure they are properly garbage-collected.
|
|
|
|
Objects are never allocated statically or on the stack; they must be
|
|
|
|
accessed through special macros and functions only. (Type objects are
|
|
|
|
exceptions to the first rule; the standard types are represented by
|
2002-07-07 16:59:50 -03:00
|
|
|
statically initialized type objects, although work on type/class unification
|
|
|
|
for Python 2.2 made it possible to have heap-allocated type objects too).
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
An object has a 'reference count' that is increased or decreased when a
|
|
|
|
pointer to the object is copied or deleted; when the reference count
|
|
|
|
reaches zero there are no references to the object left and it can be
|
|
|
|
removed from the heap.
|
|
|
|
|
|
|
|
An object has a 'type' that determines what it represents and what kind
|
|
|
|
of data it contains. An object's type is fixed when it is created.
|
|
|
|
Types themselves are represented as objects; an object contains a
|
|
|
|
pointer to the corresponding type object. The type itself has a type
|
|
|
|
pointer pointing to the object representing the type 'type', which
|
|
|
|
contains a pointer to itself!).
|
|
|
|
|
|
|
|
Objects do not float around in memory; once allocated an object keeps
|
|
|
|
the same size and address. Objects that must hold variable-size data
|
|
|
|
can contain pointers to variable-size parts of the object. Not all
|
|
|
|
objects of the same type have the same size; but the size cannot change
|
|
|
|
after allocation. (These restrictions are made so a reference to an
|
|
|
|
object can be simply a pointer -- moving an object would require
|
|
|
|
updating all the pointers, and changing an object's size would require
|
|
|
|
moving it if there was another object right next to it.)
|
|
|
|
|
1995-01-12 07:45:45 -04:00
|
|
|
Objects are always accessed through pointers of the type 'PyObject *'.
|
|
|
|
The type 'PyObject' is a structure that only contains the reference count
|
1990-10-14 09:07:46 -03:00
|
|
|
and the type pointer. The actual memory allocated for an object
|
|
|
|
contains other data that can only be accessed after casting the pointer
|
|
|
|
to a pointer to a longer structure type. This longer type must start
|
1995-01-12 07:45:45 -04:00
|
|
|
with the reference count and type fields; the macro PyObject_HEAD should be
|
2000-07-16 09:04:32 -03:00
|
|
|
used for this (to accommodate for future changes). The implementation
|
1990-10-14 09:07:46 -03:00
|
|
|
of a particular object type can cast the object pointer to the proper
|
|
|
|
type and back.
|
|
|
|
|
|
|
|
A standard interface exists for objects that contain an array of items
|
|
|
|
whose size is determined when the object is allocated.
|
|
|
|
*/
|
|
|
|
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
/* Py_DEBUG implies Py_TRACE_REFS. */
|
|
|
|
#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS)
|
1995-01-12 07:45:45 -04:00
|
|
|
#define Py_TRACE_REFS
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#endif
|
1990-12-20 11:06:42 -04:00
|
|
|
|
2002-07-07 16:59:50 -03:00
|
|
|
/* Py_TRACE_REFS implies Py_REF_DEBUG. */
|
|
|
|
#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG)
|
1995-01-12 07:45:45 -04:00
|
|
|
#define Py_REF_DEBUG
|
2002-07-07 16:59:50 -03:00
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1995-01-12 07:45:45 -04:00
|
|
|
#ifdef Py_TRACE_REFS
|
2002-07-07 16:59:50 -03:00
|
|
|
/* Define pointers to support a doubly-linked list of all live heap objects. */
|
|
|
|
#define _PyObject_HEAD_EXTRA \
|
|
|
|
struct _object *_ob_next; \
|
|
|
|
struct _object *_ob_prev;
|
|
|
|
|
|
|
|
#define _PyObject_EXTRA_INIT 0, 0,
|
|
|
|
|
|
|
|
#else
|
|
|
|
#define _PyObject_HEAD_EXTRA
|
|
|
|
#define _PyObject_EXTRA_INIT
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* PyObject_HEAD defines the initial segment of every PyObject. */
|
|
|
|
#define PyObject_HEAD \
|
|
|
|
_PyObject_HEAD_EXTRA \
|
2006-03-01 00:02:43 -04:00
|
|
|
Py_ssize_t ob_refcnt; \
|
1990-10-14 09:07:46 -03:00
|
|
|
struct _typeobject *ob_type;
|
|
|
|
|
2002-07-07 16:59:50 -03:00
|
|
|
#define PyObject_HEAD_INIT(type) \
|
|
|
|
_PyObject_EXTRA_INIT \
|
|
|
|
1, type,
|
|
|
|
|
|
|
|
/* PyObject_VAR_HEAD defines the initial segment of all variable-size
|
|
|
|
* container objects. These end with a declaration of an array with 1
|
|
|
|
* element, but enough space is malloc'ed so that the array actually
|
|
|
|
* has room for ob_size elements. Note that ob_size is an element count,
|
|
|
|
* not necessarily a byte count.
|
|
|
|
*/
|
|
|
|
#define PyObject_VAR_HEAD \
|
|
|
|
PyObject_HEAD \
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t ob_size; /* Number of items in variable part */
|
|
|
|
#define Py_INVALID_SIZE (Py_ssize_t)-1
|
2002-07-07 02:13:56 -03:00
|
|
|
|
2002-07-07 16:59:50 -03:00
|
|
|
/* Nothing is actually declared to be a PyObject, but every pointer to
|
|
|
|
* a Python object can be cast to a PyObject*. This is inheritance built
|
|
|
|
* by hand. Similarly every pointer to a variable-size Python object can,
|
|
|
|
* in addition, be cast to PyVarObject*.
|
|
|
|
*/
|
1990-10-14 09:07:46 -03:00
|
|
|
typedef struct _object {
|
1995-01-12 07:45:45 -04:00
|
|
|
PyObject_HEAD
|
|
|
|
} PyObject;
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
typedef struct {
|
1995-01-12 07:45:45 -04:00
|
|
|
PyObject_VAR_HEAD
|
1997-05-15 18:31:03 -03:00
|
|
|
} PyVarObject;
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Type objects contain a string containing the type name (to help somewhat
|
2002-07-07 16:59:50 -03:00
|
|
|
in debugging), the allocation parameters (see PyObject_New() and
|
|
|
|
PyObject_NewVar()),
|
|
|
|
and methods for accessing objects of the type. Methods are optional, a
|
1990-10-14 09:07:46 -03:00
|
|
|
nil pointer meaning that particular kind of access is not available for
|
1995-01-12 07:45:45 -04:00
|
|
|
this type. The Py_DECREF() macro uses the tp_dealloc method without
|
1990-10-14 09:07:46 -03:00
|
|
|
checking for a nil pointer; it should always be implemented except if
|
|
|
|
the implementation can guarantee that the reference count will never
|
2002-07-07 16:59:50 -03:00
|
|
|
reach zero (e.g., for statically allocated type objects).
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
NB: the methods for certain type groups are now contained in separate
|
|
|
|
method blocks.
|
|
|
|
*/
|
|
|
|
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef PyObject * (*unaryfunc)(PyObject *);
|
|
|
|
typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
|
|
|
|
typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *);
|
|
|
|
typedef int (*inquiry)(PyObject *);
|
2006-02-15 13:27:45 -04:00
|
|
|
typedef Py_ssize_t (*lenfunc)(PyObject *);
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef int (*coercion)(PyObject **, PyObject **);
|
2006-02-15 13:27:45 -04:00
|
|
|
typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
|
|
|
|
typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
|
|
|
|
typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
|
|
|
|
typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *);
|
2006-02-15 13:27:45 -04:00
|
|
|
|
|
|
|
/* ssize_t-based buffer interface */
|
|
|
|
typedef Py_ssize_t (*readbufferproc)(PyObject *, Py_ssize_t, void **);
|
|
|
|
typedef Py_ssize_t (*writebufferproc)(PyObject *, Py_ssize_t, void **);
|
|
|
|
typedef Py_ssize_t (*segcountproc)(PyObject *, Py_ssize_t *);
|
2006-02-27 12:46:16 -04:00
|
|
|
typedef Py_ssize_t (*charbufferproc)(PyObject *, Py_ssize_t, char **);
|
2006-02-15 13:27:45 -04:00
|
|
|
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef int (*objobjproc)(PyObject *, PyObject *);
|
|
|
|
typedef int (*visitproc)(PyObject *, void *);
|
|
|
|
typedef int (*traverseproc)(PyObject *, visitproc, void *);
|
1994-08-01 08:34:53 -03:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
typedef struct {
|
2006-08-17 02:42:55 -03:00
|
|
|
/* Number implementations must check *both*
|
2001-01-17 11:20:39 -04:00
|
|
|
arguments for proper type and implement the necessary conversions
|
|
|
|
in the slot functions themselves. */
|
2001-01-03 21:31:50 -04:00
|
|
|
|
1994-08-01 08:34:53 -03:00
|
|
|
binaryfunc nb_add;
|
|
|
|
binaryfunc nb_subtract;
|
|
|
|
binaryfunc nb_multiply;
|
|
|
|
binaryfunc nb_remainder;
|
|
|
|
binaryfunc nb_divmod;
|
1994-08-09 10:21:54 -03:00
|
|
|
ternaryfunc nb_power;
|
1994-08-01 08:34:53 -03:00
|
|
|
unaryfunc nb_negative;
|
|
|
|
unaryfunc nb_positive;
|
|
|
|
unaryfunc nb_absolute;
|
2006-11-28 15:15:13 -04:00
|
|
|
inquiry nb_bool;
|
1994-08-01 08:34:53 -03:00
|
|
|
unaryfunc nb_invert;
|
|
|
|
binaryfunc nb_lshift;
|
|
|
|
binaryfunc nb_rshift;
|
|
|
|
binaryfunc nb_and;
|
|
|
|
binaryfunc nb_xor;
|
|
|
|
binaryfunc nb_or;
|
|
|
|
coercion nb_coerce;
|
|
|
|
unaryfunc nb_int;
|
|
|
|
unaryfunc nb_long;
|
|
|
|
unaryfunc nb_float;
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-13 15:07:49 -03:00
|
|
|
/* NB: nb_oct and nb_hex are not used anymore. */
|
1994-08-01 08:34:53 -03:00
|
|
|
unaryfunc nb_oct;
|
|
|
|
unaryfunc nb_hex;
|
2006-08-17 02:42:55 -03:00
|
|
|
|
2000-08-24 17:09:45 -03:00
|
|
|
binaryfunc nb_inplace_add;
|
|
|
|
binaryfunc nb_inplace_subtract;
|
|
|
|
binaryfunc nb_inplace_multiply;
|
|
|
|
binaryfunc nb_inplace_remainder;
|
|
|
|
ternaryfunc nb_inplace_power;
|
|
|
|
binaryfunc nb_inplace_lshift;
|
|
|
|
binaryfunc nb_inplace_rshift;
|
|
|
|
binaryfunc nb_inplace_and;
|
|
|
|
binaryfunc nb_inplace_xor;
|
|
|
|
binaryfunc nb_inplace_or;
|
2001-08-08 02:00:18 -03:00
|
|
|
|
|
|
|
binaryfunc nb_floor_divide;
|
|
|
|
binaryfunc nb_true_divide;
|
|
|
|
binaryfunc nb_inplace_floor_divide;
|
|
|
|
binaryfunc nb_inplace_true_divide;
|
2006-03-07 14:50:55 -04:00
|
|
|
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
which unfortunately means the errors from the bytes type change somewhat:
bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a
TypeError (either that, or bytes(1.0) also raises a ValueError --
PyNumber_AsSsize_t() can only raise one type of exception.)
Merged revisions 51188-51433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines
Retrieval of previous shell command was not always preserving indentation
since 1.2a1) Patch 1528468 Tal Einat.
........
r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines
Chris McDonough's patch to defend against certain DoS attacks on FieldStorage.
SF bug #1112549.
........
r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines
News item for SF bug 1112549.
........
r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines
Fix title -- it's rc1, not beta3.
........
r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines
Update dangling references to the 3.2 database to
mention that this is UCD 4.1 now.
........
r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines
Followup to bug #1069160.
PyThreadState_SetAsyncExc(): internal correctness changes wrt
refcount safety and deadlock avoidance. Also added a basic test
case (relying on ctypes) and repaired the docs.
........
r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines
Whitespace normalization.
........
r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines
Whitespace normalization broke test_cgi, because a line
of quoted test data relied on preserving a single trailing
blank. Changed the string from raw to regular, and forced
in the trailing blank via an explicit \x20 escape.
........
r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines
test_PyThreadState_SetAsyncExc(): This is failing on some
64-bit boxes. I have no idea what the ctypes docs mean
by "integers", and blind-guessing here that it intended to
mean the signed C "int" type, in which case perhaps I can
repair this by feeding the thread id argument to type
ctypes.c_long().
Also made the worker thread daemonic, so it doesn't hang
Python shutdown if the test continues to fail.
........
r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines
force_test_exit(): This has been completely ineffective
at stopping test_signal from hanging forever on the Tru64
buildbot. That could be because there's no such thing as
signal.SIGALARM. Changed to the idiotic (but standard)
signal.SIGALRM instead, and added some more debug output.
........
r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines
Fix the failures on cygwin (2006-08-10 fixed the actual locking issue).
The first hunk changes the colon to an ! like other Windows variants.
We need to always wait on the child so the lock gets released and
no other tests fail. This is the try/finally in the second hunk.
........
r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines
Add Chris McDonough (latest cgi.py patch)
........
r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines
logging's atexit hook now runs even if the rest of the module has
already been cleaned up.
........
r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines
Add ignore of *.pyc and *.pyo to Lib/xml/etree/.
........
r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines
When a ctypes C callback function is called, zero out the result
storage before converting the result to C data. See the comment in
the code for details.
Provide a better context for errors when the conversion of a callback
function's result cannot be converted.
........
r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines
Klocwork made another run and found a bunch more problems.
This is the first batch of fixes that should be easy to verify based on context.
This fixes problem numbers: 220 (ast), 323-324 (symtable),
321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree).
........
r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines
Even though _Py_Mangle() isn't truly public anyone can call it and
there was no verification that privateobj was a PyString. If it wasn't
a string, this could have allowed a NULL pointer to creep in below and crash.
I wonder if this should be PyString_CheckExact? Must identifiers be strings
or can they be subclasses?
Klocwork #275
........
r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines
It's highly unlikely, though possible for PyEval_Get*() to return NULLs.
So be safe and do an XINCREF.
Klocwork # 221-222.
........
r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines
This code is actually not used unless WITHOUT_COMPLEX is defined.
However, there was no error checking that PyFloat_FromDouble returned
a valid pointer. I believe this change is correct as it seemed
to follow other code in the area.
Klocwork # 292.
........
r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines
Handle NULL nodes while parsing. I'm not entirely sure this is correct.
There might be something else that needs to be done to setup the error.
Klocwork #295.
........
r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines
If _stat_float_times is false, we will try to INCREF ival which could be NULL.
Return early in that case. The caller checks for PyErr_Occurred so this
should be ok.
Klocwork #297
........
r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines
Move the assert which checks for a NULL pointer first.
Klocwork #274.
........
r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines
Try to handle a malloc failure. I'm not entirely sure this is correct.
There might be something else we need to do to handle the exception.
Klocwork # 212-213
........
r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines
I'm not sure why this code allocates this string for the error message.
I think it would be better to always use snprintf and have the format
limit the size of the name appropriately (like %.200s).
Klocwork #340
........
r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines
Check returned pointer is valid.
Klocwork #233
........
r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line
Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed
........
r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines
Don't deref v if it's NULL.
Klocwork #214
........
r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines
Check return of PyMem_MALLOC (garbage) is non-NULL.
Check seq in both portions of if/else.
Klocwork #289-290.
........
r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines
PyModule_GetDict() can fail, produce fatal errors if this happens on startup.
Klocwork #298-299.
........
r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines
Verify verdat which is returned from malloc is not NULL.
Ensure we don't pass NULL to free.
Klocwork #306 (at least the first part, checking malloc)
........
r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines
test_signal: Signal handling on the Tru64 buildbot
appears to be utterly insane. Plug some theoretical
insecurities in the test script:
- Verify that the SIGALRM handler was actually installed.
- Don't call alarm() before the handler is installed.
- Move everything that can fail inside the try/finally,
so the test cleans up after itself more often.
- Try sending all the expected signals in
force_test_exit(), not just SIGALRM. Since that was
fixed to actually send SIGALRM (instead of invisibly
dying with an AttributeError), we've seen that sending
SIGALRM alone does not stop this from hanging.
- Move the "kill the child" business into the finally
clause, so the child doesn't survive test failure
to send SIGALRM to other tests later (there are also
baffling SIGALRM-related failures in test_socket).
- Cancel the alarm in the finally clause -- if the
test dies early, we again don't want SIGALRM showing
up to confuse a later test.
Alas, this still relies on timing luck wrt the spawned
script that sends the test signals, but it's hard to see
how waiting for seconds can so often be so unlucky.
test_threadedsignals: curiously, this test never fails
on Tru64, but doesn't normally signal SIGALRM. Anyway,
fixed an obvious (but probably inconsequential) logic
error.
........
r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines
Ah, fudge. One of the prints here actually "shouldn't be"
protected by "if verbose:", which caused the test to fail on
all non-Windows boxes.
Note that I deliberately didn't convert this to unittest yet,
because I expect it would be even harder to debug this on Tru64
after conversion.
........
r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines
Repair logging test spew caused by rev. 51206.
........
r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines
Patch #1538606, Patch to fix __index__() clipping.
I modified this patch some by fixing style, some error checking, and adding
XXX comments. This patch requires review and some changes are to be expected.
I'm checking in now to get the greatest possible review and establish a
baseline for moving forward. I don't want this to hold up release if possible.
........
r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines
Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots
were failing due to inappropriate clipping of numbers larger than 2**31
with new-style classes. (typeobject.c) In reviewing the code for classic
classes, there were 2 problems. Any negative value return could be returned.
Always return -1 if there was an error. Also make the checks similar
with the new-style classes. I believe this is correct for 32 and 64 bit
boxes, including Windows64.
Add a test of classic classes too.
........
r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line
SF bug #1539336, distutils example code missing
........
r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines
Move/copy assert for tstate != NULL before first use.
Verify that PyEval_Get{Globals,Locals} returned valid pointers.
Klocwork 231-232
........
r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle a whole lot of failures from PyString_FromInternedString().
Should fix most of Klocwork 234-272.
........
r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines
cpathname could be NULL if it was longer than MAXPATHLEN. Don't try
to write the .pyc to NULL.
Check results of PyList_GetItem() and PyModule_GetDict() are not NULL.
Klocwork 282, 283, 285
........
r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines
Fix segfault when doing string formatting on subclasses of long if
__oct__, __hex__ don't return a string.
Klocwork 308
........
r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines
Check return result of PyModule_GetDict().
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle malloc and fopen failures more gracefully.
Klocwork 180-181
........
r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines
It's very unlikely, though possible that source is not a string. Verify
that PyString_AsString() returns a valid pointer. (The problem can
arise when zlib.decompress doesn't return a string.)
Klocwork 346
........
r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle failures from lookup.
Klocwork 341-342
........
r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines
Handle failure from PyModule_GetDict() (Klocwork 208).
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines
Really address the issue of where to place the assert for leftblock.
(Followup of Klocwork 274)
........
r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle malloc failure.
Klocwork 281
........
r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle alloca failures.
Klocwork 225-228
........
r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line
Get rid of compiler warning
........
r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line
Ignore pgen.exe and kill_python.exe for cygwin
........
r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines
Can't return NULL from a void function. If there is a memory error,
about the best we can do is call PyErr_WriteUnraisable and go on.
We won't be able to do the call below either, so verify delstr is valid.
........
r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line
Update purify doc some.
........
r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines
Remove unused, buggy test function.
Fixes klockwork issue #207.
........
r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value from new_CArgObject().
Fixes klockwork issues #183, #184, #185.
........
r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value of GenericCData_new().
Fixes klockwork issues #188, #189.
........
r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines
Revert the change that tries to zero out a closure's result storage
area because the size if unknown in source/callproc.c.
........
r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines
Slightly revised version of patch #1538956:
Replace UnicodeDecodeErrors raised during == and !=
compares of Unicode and other objects with a new
UnicodeWarning.
All other comparisons continue to raise exceptions.
Exceptions other than UnicodeDecodeErrors are also left
untouched.
........
r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines
Apply the patch #1532975 plus ideas from the patch #1533481.
ctypes instances no longer have the internal and undocumented
'_as_parameter_' attribute which was used to adapt them to foreign
function calls; this mechanism is replaced by a function pointer in
the type's stgdict.
In the 'from_param' class methods, try the _as_parameter_ attribute if
other conversions are not possible.
This makes the documented _as_parameter_ mechanism work as intended.
Change the ctypes version number to 1.0.1.
........
r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines
Readd NEWS items that were accidentally removed by r51276.
........
r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines
Improve markup in PyUnicode_RichCompare.
........
r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines
Correct an accidentally removed previous patch.
........
r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536908: Add support for AMD64 / OpenBSD.
Remove the -no-stack-protector compiler flag for OpenBSD
as it has been reported to be unneeded.
........
r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line
News item for rev 51281.
........
r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines
Fix refleak introduced in rev. 51248.
........
r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines
Make tabnanny recognize IndentationErrors raised by tokenize.
Add a test to test_inspect to make sure indented source
is recognized correctly. (fixes #1224621)
........
r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1535500: fix segfault in BZ2File.writelines and make sure it
raises the correct exceptions.
........
r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines
Add an additional test: BZ2File write methods should raise IOError
when file is read-only.
........
r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536071: trace.py should now find the full module name of a
file correctly even on Windows.
........
r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Cookie.py shouldn't "bogusly" use string._idmap.
........
r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Patch #1511317: don't crash on invalid hostname info
........
r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines
Whitespace normalization.
........
r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines
Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries.
Now we're even. :-)
........
r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines
Fix the test for SocketServer so it should pass on cygwin and not fail
sporadically on other platforms. This is really a band-aid that doesn't
fix the underlying issue in SocketServer. It's not clear if it's worth
it to fix SocketServer, however, I opened a bug to track it:
http://python.org/sf/1540386
........
r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines
Update the docstring to use a version a little newer than 1999. This was
taken from a Debian patch. Should we update the version for each release?
........
r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines
Subclasses of int/long are allowed to define an __index__.
........
r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line
Check for NULL return value from new_CArgObject calls.
........
r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines
The 'with' statement is now a Code Context block opener
........
r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1
........
r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1 - no, really this time
........
r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines
Patch #1540892: site.py Quitter() class attempts to close sys.stdin
before raising SystemExit, allowing IDLE to honor quit() and exit().
M Lib/site.py
M Lib/idlelib/PyShell.py
M Lib/idlelib/CREDITS.txt
M Lib/idlelib/NEWS.txt
M Misc/NEWS
........
r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines
Update code and tests to support the 'bytes_le' attribute (for
little-endian byte order on Windows), and to work around clocks
with low resolution yielding duplicate UUIDs.
Anthony Baxter has approved this change.
........
r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines
Get quit() and exit() to work cleanly when not using subprocess.
........
r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines
Revert to having static version numbers again.
........
r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines
Build _hashlib on Windows. Build OpenSSL with masm assembler code.
Fixes #1535502.
........
r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines
Add commented assert statements to check that the result of
PyObject_stgdict() and PyType_stgdict() calls are non-NULL before
dereferencing the result. Hopefully this fixes what klocwork is
complaining about.
Fix a few other nits as well.
........
r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line
news entry for 51307
........
r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line
Add UnicodeWarning
........
r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line
Bump document version to 1.0; remove pystone paragraph
........
r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line
Link to docs; remove an XXX comment
........
r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line
Make cl build step compile-only (/c). Remove libs from source list.
........
r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines
The __repr__ method of a NULL py_object does no longer raise an
exception. Remove a stray '?' character from the exception text
when the value is retrieved of such an object.
Includes tests.
........
r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line
Update bug/patch counts
........
r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line
Wording/typo fixes
........
r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines
Remove the special casing of Py_None when converting the return value
of the Python part of a callback function to C. If it cannot be
converted, call PyErr_WriteUnraisable with the exception we got.
Before, arbitrary data has been passed to the calling C code in this
case.
(I'm not really sure the NEWS entry is understandable, but I cannot
find better words)
........
r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines
Add NEWS item mentioning the reverted distutils version number patch.
........
r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines
SF#1534630
ignore data that arrives before the opening start tag
........
r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line
Grammar fix
........
r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines
Tutorial:
Clarify somewhat how parameters are passed to functions
(especially explain what integer means).
Correct the table - Python integers and longs can both be used.
Further clarification to the table comparing ctypes types, Python
types, and C types.
Reference:
Replace integer by C ``int`` where it makes sense.
........
r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines
File menu hotkeys: there were three 'p' assignments. Reassign the
'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the
Shell menu hotkey from 's' to 'l'.
M Bindings.py
M PyShell.py
M NEWS.txt
........
r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines
Fix a bug in the ``compiler`` package that caused invalid code to be
generated for generator expressions.
........
r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines
Merge 51340 and 51341 from 2.5 branch:
Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
........
r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines
Bug #1541863: uuid.uuid1 failed to generate unique identifiers
on systems with low clock resolution.
........
r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line
Add template for 2.6 on HEAD
........
r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line
More post-release wibble
........
r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again
........
r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again. Take 2
........
r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Unix bots install working again.
........
r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line
Set version to 2.6a0, seems more consistent.
........
r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line
More version wibble
........
r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines
Bug #1541682: Fix example in the "Refcount details" API docs.
Additionally, remove a faulty example showing PySequence_SetItem applied
to a newly created list object and add notes that this isn't a good idea.
........
r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines
Updating IDLE's version number to match Python's (as per python-dev
discussion).
........
r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line
RPM specfile updates
........
r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines
Typo in tp_clear docs.
........
r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line
Minor edits
........
r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines
Add asserts to check for 'impossible' NULL values, with comments.
In one place where I'n not 1000% sure about the non-NULL, raise
a RuntimeError for safety.
This should fix the klocwork issues that Neal sent me. If so,
it should be applied to the release25-maint branch also.
........
r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines
Move initialization of interned strings to before allocating the
object so we don't leak op. (Fixes an earlier patch to this code)
Klockwork #350
........
r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines
Move assert to after NULL check, otherwise we deref NULL in the assert.
Klocwork #307
........
r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines
SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
........
r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines
Move initialization to after the asserts for non-NULL values.
Klocwork 286-287.
(I'm not backporting this, but if someone wants to, feel free.)
........
r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines
Handle PyString_FromInternedString() failing (unlikely, but possible).
Klocwork #325
(I'm not backporting this, but if someone wants to, feel free.)
........
r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines
Patch #1542948: fix urllib2 header casing issue. With new test.
........
r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines
Move peephole optimizer to separate file.
........
r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines
Move peephole optimizer to separate file. (Forgot .h in previous checkin.)
........
r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines
Fix bug #1543303, tarfile adds padding that breaks gunzip.
Patch # 1543897.
Will backport to 2.5
........
r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines
Add assert to make Klocwork happy (#276)
........
2006-08-21 16:07:27 -03:00
|
|
|
unaryfunc nb_index;
|
1995-01-12 07:45:45 -04:00
|
|
|
} PyNumberMethods;
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
typedef struct {
|
2006-02-15 13:27:45 -04:00
|
|
|
lenfunc sq_length;
|
1994-08-01 08:34:53 -03:00
|
|
|
binaryfunc sq_concat;
|
2006-02-15 13:27:45 -04:00
|
|
|
ssizeargfunc sq_repeat;
|
|
|
|
ssizeargfunc sq_item;
|
|
|
|
ssizessizeargfunc sq_slice;
|
|
|
|
ssizeobjargproc sq_ass_item;
|
|
|
|
ssizessizeobjargproc sq_ass_slice;
|
2000-02-28 11:00:40 -04:00
|
|
|
objobjproc sq_contains;
|
2006-08-17 02:42:55 -03:00
|
|
|
|
2000-08-24 17:09:45 -03:00
|
|
|
binaryfunc sq_inplace_concat;
|
2006-02-15 13:27:45 -04:00
|
|
|
ssizeargfunc sq_inplace_repeat;
|
1995-01-12 07:45:45 -04:00
|
|
|
} PySequenceMethods;
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
typedef struct {
|
2006-02-15 13:27:45 -04:00
|
|
|
lenfunc mp_length;
|
1994-08-01 08:34:53 -03:00
|
|
|
binaryfunc mp_subscript;
|
|
|
|
objobjargproc mp_ass_subscript;
|
1995-01-12 07:45:45 -04:00
|
|
|
} PyMappingMethods;
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1997-05-05 19:15:02 -03:00
|
|
|
typedef struct {
|
2006-02-15 13:27:45 -04:00
|
|
|
readbufferproc bf_getreadbuffer;
|
|
|
|
writebufferproc bf_getwritebuffer;
|
|
|
|
segcountproc bf_getsegcount;
|
|
|
|
charbufferproc bf_getcharbuffer;
|
1997-05-05 19:15:02 -03:00
|
|
|
} PyBufferProcs;
|
2002-07-07 02:13:56 -03:00
|
|
|
|
1997-05-05 19:15:02 -03:00
|
|
|
|
2002-04-11 22:57:06 -03:00
|
|
|
typedef void (*freefunc)(void *);
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef void (*destructor)(PyObject *);
|
|
|
|
typedef int (*printfunc)(PyObject *, FILE *, int);
|
2006-02-27 12:46:16 -04:00
|
|
|
typedef PyObject *(*getattrfunc)(PyObject *, char *);
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
|
2006-02-27 12:46:16 -04:00
|
|
|
typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
|
2000-07-07 21:32:04 -03:00
|
|
|
typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *);
|
|
|
|
typedef int (*cmpfunc)(PyObject *, PyObject *);
|
|
|
|
typedef PyObject *(*reprfunc)(PyObject *);
|
|
|
|
typedef long (*hashfunc)(PyObject *);
|
2001-01-17 11:20:39 -04:00
|
|
|
typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int);
|
2001-04-20 16:13:02 -03:00
|
|
|
typedef PyObject *(*getiterfunc) (PyObject *);
|
2001-04-23 11:08:49 -03:00
|
|
|
typedef PyObject *(*iternextfunc) (PyObject *);
|
2001-08-02 01:15:00 -03:00
|
|
|
typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
|
|
|
|
typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
|
|
|
|
typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
|
|
|
|
typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *);
|
2006-02-15 13:27:45 -04:00
|
|
|
typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t);
|
1994-08-01 08:34:53 -03:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
typedef struct _typeobject {
|
1995-01-12 07:45:45 -04:00
|
|
|
PyObject_VAR_HEAD
|
2005-12-10 14:50:16 -04:00
|
|
|
const char *tp_name; /* For printing, in format "<module>.<name>" */
|
2006-02-16 10:24:38 -04:00
|
|
|
Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
|
2002-07-07 02:13:56 -03:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Methods to implement standard operations */
|
2002-07-07 02:13:56 -03:00
|
|
|
|
1994-08-01 08:34:53 -03:00
|
|
|
destructor tp_dealloc;
|
|
|
|
printfunc tp_print;
|
|
|
|
getattrfunc tp_getattr;
|
|
|
|
setattrfunc tp_setattr;
|
|
|
|
cmpfunc tp_compare;
|
|
|
|
reprfunc tp_repr;
|
2002-07-07 02:13:56 -03:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Method suites for standard classes */
|
2002-07-07 02:13:56 -03:00
|
|
|
|
1995-01-12 07:45:45 -04:00
|
|
|
PyNumberMethods *tp_as_number;
|
|
|
|
PySequenceMethods *tp_as_sequence;
|
|
|
|
PyMappingMethods *tp_as_mapping;
|
1993-03-29 06:43:31 -04:00
|
|
|
|
2000-03-21 12:14:47 -04:00
|
|
|
/* More standard operations (here for binary compatibility) */
|
1993-03-29 06:43:31 -04:00
|
|
|
|
1994-08-01 08:34:53 -03:00
|
|
|
hashfunc tp_hash;
|
1995-07-18 11:21:06 -03:00
|
|
|
ternaryfunc tp_call;
|
1995-01-07 06:32:04 -04:00
|
|
|
reprfunc tp_str;
|
1996-08-09 17:48:52 -03:00
|
|
|
getattrofunc tp_getattro;
|
|
|
|
setattrofunc tp_setattro;
|
1995-01-07 06:32:04 -04:00
|
|
|
|
1997-05-05 19:15:02 -03:00
|
|
|
/* Functions to access object as input/output buffer */
|
|
|
|
PyBufferProcs *tp_as_buffer;
|
2002-07-07 02:13:56 -03:00
|
|
|
|
Changes by Greg Stein (code) and GvR (design).
Add a new member to the PyBufferProcs struct, bf_getcharbuffer. For
backward compatibility, this member should only be used (this includes
testing for NULL!) when the flag Py_TPFLAGS_HAVE_GETCHARBUFFER is set
in the type structure, below. Note that if its flag is not set, we
may be looking at an extension module compiled for 1.5.1, which will
have garbage at the bf_getcharbuffer member (because the struct wasn't
as long then). If the flag is one, the pointer may still be NULL.
The function found at this member is used in a similar manner as
bf_getreadbuffer, but it is known to point to 8-bit character data.
(See discussion in getargs.c checked in later.)
As a general feature for extending the type structure and the various
structures that (may) hang off it in a backwards compatible way, we
rename the tp_xxx4 "spare" slot to tp_flags. In 1.5.1 and before,
this slot was always zero. In 1.5.1, it may contain various flags
indicating extra fields that weren't present in 1.5.1. The only flag
defined so far is for the bf_getcharbuffer member of the PyBufferProcs
struct.
Note that the new spares (tp_xxx5 - tp_xxx8), once they become used,
should also be protected by a flag (or flags) in tp_flags.
1998-10-07 23:10:56 -03:00
|
|
|
/* Flags to define presence of optional/expanded features */
|
|
|
|
long tp_flags;
|
1995-01-07 06:32:04 -04:00
|
|
|
|
2005-12-10 14:50:16 -04:00
|
|
|
const char *tp_doc; /* Documentation string */
|
1995-01-07 06:32:04 -04:00
|
|
|
|
2001-08-15 15:32:33 -03:00
|
|
|
/* Assigned meaning in release 2.0 */
|
2000-06-23 11:18:11 -03:00
|
|
|
/* call function for all accessible objects */
|
|
|
|
traverseproc tp_traverse;
|
2002-07-07 02:13:56 -03:00
|
|
|
|
2000-06-23 11:18:11 -03:00
|
|
|
/* delete references to contained objects */
|
|
|
|
inquiry tp_clear;
|
|
|
|
|
2001-08-15 15:32:33 -03:00
|
|
|
/* Assigned meaning in release 2.1 */
|
2001-01-17 11:20:39 -04:00
|
|
|
/* rich comparisons */
|
|
|
|
richcmpfunc tp_richcompare;
|
|
|
|
|
2001-02-01 01:27:45 -04:00
|
|
|
/* weak reference enabler */
|
2006-02-16 10:24:38 -04:00
|
|
|
Py_ssize_t tp_weaklistoffset;
|
1998-04-23 16:16:44 -03:00
|
|
|
|
2001-04-20 16:13:02 -03:00
|
|
|
/* Iterators */
|
|
|
|
getiterfunc tp_iter;
|
2001-04-23 11:08:49 -03:00
|
|
|
iternextfunc tp_iternext;
|
2001-04-20 16:13:02 -03:00
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
/* Attribute descriptor and subclassing stuff */
|
|
|
|
struct PyMethodDef *tp_methods;
|
2001-09-20 17:46:19 -03:00
|
|
|
struct PyMemberDef *tp_members;
|
2001-09-20 18:45:26 -03:00
|
|
|
struct PyGetSetDef *tp_getset;
|
2001-08-02 01:15:00 -03:00
|
|
|
struct _typeobject *tp_base;
|
|
|
|
PyObject *tp_dict;
|
|
|
|
descrgetfunc tp_descr_get;
|
|
|
|
descrsetfunc tp_descr_set;
|
2006-02-16 10:24:38 -04:00
|
|
|
Py_ssize_t tp_dictoffset;
|
2001-08-02 01:15:00 -03:00
|
|
|
initproc tp_init;
|
|
|
|
allocfunc tp_alloc;
|
|
|
|
newfunc tp_new;
|
2002-04-11 22:57:06 -03:00
|
|
|
freefunc tp_free; /* Low-level free-memory routine */
|
Add Garbage Collection support to new-style classes (not yet to their
instances).
Also added GC support to various auxiliary types: super, property,
descriptors, wrappers, dictproxy. (Only type objects have a tp_clear
field; the other types are.)
One change was necessary to the GC infrastructure. We have statically
allocated type objects that don't have a GC header (and can't easily
be given one) and heap-allocated type objects that do have a GC
header. Giving these different metatypes would be really ugly: I
tried, and I had to modify pickle.py, cPickle.c, copy.py, add a new
invent a new name for the new metatype and make it a built-in, change
affected tests... In short, a mess. So instead, we add a new type
slot tp_is_gc, which is a simple Boolean function that determines
whether a particular instance has GC headers or not. This slot is
only relevant for types that have the (new) GC flag bit set. If the
tp_is_gc slot is NULL (by far the most common case), all instances of
the type are deemed to have GC headers. This slot is called by the
PyObject_IS_GC() macro (which is only used twice, both times in
gcmodule.c).
I also changed the extern declarations for a bunch of GC-related
functions (_PyObject_GC_Del etc.): these always exist but objimpl.h
only declared them when WITH_CYCLE_GC was defined, but I needed to be
able to reference them without #ifdefs. (When WITH_CYCLE_GC is not
defined, they do the same as their non-GC counterparts anyway.)
2001-10-02 18:24:57 -03:00
|
|
|
inquiry tp_is_gc; /* For PyObject_IS_GC */
|
2001-08-02 01:15:00 -03:00
|
|
|
PyObject *tp_bases;
|
|
|
|
PyObject *tp_mro; /* method resolution order */
|
2001-10-15 19:03:32 -03:00
|
|
|
PyObject *tp_cache;
|
2001-10-08 12:18:27 -03:00
|
|
|
PyObject *tp_subclasses;
|
|
|
|
PyObject *tp_weaklist;
|
2002-08-08 17:55:20 -03:00
|
|
|
destructor tp_del;
|
2001-08-02 01:15:00 -03:00
|
|
|
|
1993-10-11 09:54:31 -03:00
|
|
|
#ifdef COUNT_ALLOCS
|
2001-04-20 16:13:02 -03:00
|
|
|
/* these must be last and never explicitly initialized */
|
2006-03-01 00:02:43 -04:00
|
|
|
Py_ssize_t tp_allocs;
|
|
|
|
Py_ssize_t tp_frees;
|
|
|
|
Py_ssize_t tp_maxalloc;
|
2006-04-21 07:40:58 -03:00
|
|
|
struct _typeobject *tp_prev;
|
1993-10-11 09:54:31 -03:00
|
|
|
struct _typeobject *tp_next;
|
|
|
|
#endif
|
1995-01-12 07:45:45 -04:00
|
|
|
} PyTypeObject;
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
|
2003-03-07 11:13:17 -04:00
|
|
|
/* The *real* layout of a type object when allocated on the heap */
|
|
|
|
typedef struct _heaptypeobject {
|
|
|
|
/* Note: there's a dependency on the order of these members
|
|
|
|
in slotptr() in typeobject.c . */
|
2006-02-20 18:27:28 -04:00
|
|
|
PyTypeObject ht_type;
|
2003-03-07 11:13:17 -04:00
|
|
|
PyNumberMethods as_number;
|
|
|
|
PyMappingMethods as_mapping;
|
|
|
|
PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
|
|
|
|
so that the mapping wins when both
|
|
|
|
the mapping and the sequence define
|
|
|
|
a given operator (e.g. __getitem__).
|
|
|
|
see add_operators() in typeobject.c . */
|
|
|
|
PyBufferProcs as_buffer;
|
2006-02-20 18:27:28 -04:00
|
|
|
PyObject *ht_name, *ht_slots;
|
2003-03-07 11:13:17 -04:00
|
|
|
/* here are optional user slots, followed by the members. */
|
|
|
|
} PyHeapTypeObject;
|
|
|
|
|
|
|
|
/* access macro to the members which are floating "behind" the object */
|
|
|
|
#define PyHeapType_GET_MEMBERS(etype) \
|
2006-02-20 18:27:28 -04:00
|
|
|
((PyMemberDef *)(((char *)etype) + (etype)->ht_type.ob_type->tp_basicsize))
|
2003-03-07 11:13:17 -04:00
|
|
|
|
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
/* Generic type check */
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);
|
2001-08-02 01:15:00 -03:00
|
|
|
#define PyObject_TypeCheck(ob, tp) \
|
|
|
|
((ob)->ob_type == (tp) || PyType_IsSubtype((ob)->ob_type, (tp)))
|
|
|
|
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */
|
|
|
|
PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */
|
|
|
|
PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */
|
2001-08-02 01:15:00 -03:00
|
|
|
|
2007-02-25 16:39:11 -04:00
|
|
|
#define PyType_Check(op) \
|
|
|
|
PyType_FastSubclass((op)->ob_type, Py_TPFLAGS_TYPE_SUBCLASS)
|
2001-10-27 16:37:48 -03:00
|
|
|
#define PyType_CheckExact(op) ((op)->ob_type == &PyType_Type)
|
2001-08-02 01:15:00 -03:00
|
|
|
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(int) PyType_Ready(PyTypeObject *);
|
2006-02-15 13:27:45 -04:00
|
|
|
PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
|
2001-08-02 01:15:00 -03:00
|
|
|
PyObject *, PyObject *);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* Generic operations on objects */
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
|
Merged revisions 53451-53537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53454 | brett.cannon | 2007-01-15 20:12:08 +0100 (Mon, 15 Jan 2007) | 3 lines
Add a note for strptime that just because strftime supports some extra
directive that is not documented that strptime will as well.
........
r53458 | vinay.sajip | 2007-01-16 10:50:07 +0100 (Tue, 16 Jan 2007) | 1 line
Updated rotating file handlers to use _open().
........
r53459 | marc-andre.lemburg | 2007-01-16 14:03:06 +0100 (Tue, 16 Jan 2007) | 2 lines
Add news items for the recent pybench and platform changes.
........
r53460 | sjoerd.mullender | 2007-01-16 17:42:38 +0100 (Tue, 16 Jan 2007) | 4 lines
Fixed ntpath.expandvars to not replace references to non-existing
variables with nothing. Also added tests.
This fixes bug #494589.
........
r53464 | neal.norwitz | 2007-01-17 07:23:51 +0100 (Wed, 17 Jan 2007) | 1 line
Give Calvin Spealman access for python-dev summaries.
........
r53465 | neal.norwitz | 2007-01-17 09:37:26 +0100 (Wed, 17 Jan 2007) | 1 line
Remove Calvin since he only has access to the website currently.
........
r53466 | thomas.heller | 2007-01-17 10:40:34 +0100 (Wed, 17 Jan 2007) | 2 lines
Replace C++ comments with C comments.
........
r53472 | andrew.kuchling | 2007-01-17 20:55:06 +0100 (Wed, 17 Jan 2007) | 1 line
[Part of bug #1599254] Add suggestion to Mailbox docs to use Maildir, and warn user to lock/unlock mailboxes when modifying them
........
r53475 | georg.brandl | 2007-01-17 22:09:04 +0100 (Wed, 17 Jan 2007) | 2 lines
Bug #1637967: missing //= operator in list.
........
r53477 | georg.brandl | 2007-01-17 22:19:58 +0100 (Wed, 17 Jan 2007) | 2 lines
Bug #1629125: fix wrong data type (int -> Py_ssize_t) in PyDict_Next docs.
........
r53481 | neal.norwitz | 2007-01-18 06:40:58 +0100 (Thu, 18 Jan 2007) | 1 line
Try reverting part of r53145 that seems to cause the Windows buildbots to fail in test_uu.UUFileTest.test_encode
........
r53482 | fred.drake | 2007-01-18 06:42:30 +0100 (Thu, 18 Jan 2007) | 1 line
add missing version entry
........
r53483 | neal.norwitz | 2007-01-18 07:20:55 +0100 (Thu, 18 Jan 2007) | 7 lines
This test doesn't pass on Windows. The cause seems to be that chmod
doesn't support the same funcationality as on Unix. I'm not sure if
this fix is the best (or if it will even work)--it's a test to see
if the buildbots start passing again.
It might be better to not even run this test if it's windows (or non-posix).
........
r53488 | neal.norwitz | 2007-01-19 06:53:33 +0100 (Fri, 19 Jan 2007) | 1 line
SF #1635217, Fix unbalanced paren
........
r53489 | martin.v.loewis | 2007-01-19 07:42:22 +0100 (Fri, 19 Jan 2007) | 3 lines
Prefix AST symbols with _Py_. Fixes #1637022.
Will backport.
........
r53497 | martin.v.loewis | 2007-01-19 19:01:38 +0100 (Fri, 19 Jan 2007) | 2 lines
Add UUIDs for 2.5.1 and 2.5.2
........
r53499 | raymond.hettinger | 2007-01-19 19:07:18 +0100 (Fri, 19 Jan 2007) | 1 line
SF# 1635892: Fix docs for betavariate's input parameters .
........
r53503 | martin.v.loewis | 2007-01-20 15:05:39 +0100 (Sat, 20 Jan 2007) | 2 lines
Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
........
r53504 | walter.doerwald | 2007-01-20 18:28:31 +0100 (Sat, 20 Jan 2007) | 2 lines
Port test_resource.py to unittest.
........
r53505 | walter.doerwald | 2007-01-20 19:19:33 +0100 (Sat, 20 Jan 2007) | 2 lines
Add argument tests an calls of resource.getrusage().
........
r53506 | walter.doerwald | 2007-01-20 20:03:17 +0100 (Sat, 20 Jan 2007) | 2 lines
resource.RUSAGE_BOTH might not exist.
........
r53507 | walter.doerwald | 2007-01-21 00:07:28 +0100 (Sun, 21 Jan 2007) | 2 lines
Port test_new.py to unittest.
........
r53508 | martin.v.loewis | 2007-01-21 10:33:07 +0100 (Sun, 21 Jan 2007) | 2 lines
Patch #1610575: Add support for _Bool to struct.
........
r53509 | georg.brandl | 2007-01-21 11:28:43 +0100 (Sun, 21 Jan 2007) | 3 lines
Bug #1486663: don't reject keyword arguments for subclasses of builtin
types.
........
r53511 | georg.brandl | 2007-01-21 11:35:10 +0100 (Sun, 21 Jan 2007) | 2 lines
Patch #1627441: close sockets properly in urllib2.
........
r53517 | georg.brandl | 2007-01-22 20:40:21 +0100 (Mon, 22 Jan 2007) | 3 lines
Use new email module names (#1637162, #1637159, #1637157).
........
r53518 | andrew.kuchling | 2007-01-22 21:26:40 +0100 (Mon, 22 Jan 2007) | 1 line
Improve pattern used for mbox 'From' lines; add a simple test
........
r53519 | andrew.kuchling | 2007-01-22 21:27:50 +0100 (Mon, 22 Jan 2007) | 1 line
Make comment match the code
........
r53522 | georg.brandl | 2007-01-22 22:10:33 +0100 (Mon, 22 Jan 2007) | 2 lines
Bug #1249573: fix rfc822.parsedate not accepting a certain date format
........
r53524 | georg.brandl | 2007-01-22 22:23:41 +0100 (Mon, 22 Jan 2007) | 2 lines
Bug #1627316: handle error in condition/ignore pdb commands more gracefully.
........
r53526 | lars.gustaebel | 2007-01-23 12:17:33 +0100 (Tue, 23 Jan 2007) | 4 lines
Patch #1507247: tarfile.py: use current umask for intermediate
directories.
........
r53527 | thomas.wouters | 2007-01-23 14:42:00 +0100 (Tue, 23 Jan 2007) | 13 lines
SF patch #1630975: Fix crash when replacing sys.stdout in sitecustomize
When running the interpreter in an environment that would cause it to set
stdout/stderr/stdin's encoding, having a sitecustomize that would replace
them with something other than PyFile objects would crash the interpreter.
Fix it by simply ignoring the encoding-setting for non-files.
This could do with a test, but I can think of no maintainable and portable
way to test this bug, short of adding a sitecustomize.py to the buildsystem
and have it always run with it (hmmm....)
........
r53528 | thomas.wouters | 2007-01-23 14:50:49 +0100 (Tue, 23 Jan 2007) | 4 lines
Add news entry about last checkin (oops.)
........
r53531 | martin.v.loewis | 2007-01-23 22:11:47 +0100 (Tue, 23 Jan 2007) | 4 lines
Make PyTraceBack_Here use the current thread, not the
frame's thread state. Fixes #1579370.
Will backport.
........
r53535 | brett.cannon | 2007-01-24 00:21:22 +0100 (Wed, 24 Jan 2007) | 5 lines
Fix crasher for when an object's __del__ creates a new weakref to itself.
Patch only fixes new-style classes; classic classes still buggy.
Closes bug #1377858. Already backported.
........
r53536 | walter.doerwald | 2007-01-24 01:42:19 +0100 (Wed, 24 Jan 2007) | 2 lines
Port test_popen.py to unittest.
........
2007-02-01 14:02:27 -04:00
|
|
|
PyAPI_FUNC(void) _Py_BreakPoint(void);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
|
2007-05-18 14:15:44 -03:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_ReprStr8(PyObject *);
|
2005-08-12 14:34:58 -03:00
|
|
|
PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
|
|
|
|
PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);
|
2006-08-23 21:41:19 -03:00
|
|
|
PyAPI_FUNC(PyObject *) Py_CmpToRich(int op, int cmp);
|
2005-12-10 14:50:16 -04:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *);
|
|
|
|
PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *);
|
|
|
|
PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
|
2003-03-17 15:46:11 -04:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *,
|
2001-08-02 01:15:00 -03:00
|
|
|
PyObject *, PyObject *);
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(long) PyObject_Hash(PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_IsTrue(PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyObject_Not(PyObject *);
|
|
|
|
PyAPI_FUNC(int) PyCallable_Check(PyObject *);
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
|
2001-02-01 01:27:45 -04:00
|
|
|
|
2001-09-18 17:38:53 -03:00
|
|
|
/* A slot function whose address we need to compare */
|
|
|
|
extern int _PyObject_SlotCompare(PyObject *, PyObject *);
|
|
|
|
|
|
|
|
|
2001-09-04 19:08:56 -03:00
|
|
|
/* PyObject_Dir(obj) acts like Python __builtin__.dir(obj), returning a
|
|
|
|
list of strings. PyObject_Dir(NULL) is like __builtin__.dir(),
|
|
|
|
returning the names of the current locals. In this case, if there are
|
|
|
|
no current locals, NULL is returned, and PyErr_Occurred() is false.
|
|
|
|
*/
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *);
|
2001-09-04 19:08:56 -03:00
|
|
|
|
|
|
|
|
1998-04-10 19:32:24 -03:00
|
|
|
/* Helpers for printing recursive container types */
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(int) Py_ReprEnter(PyObject *);
|
|
|
|
PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
|
1998-04-10 19:32:24 -03:00
|
|
|
|
2000-06-29 16:17:04 -03:00
|
|
|
/* Helpers for hash functions */
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(long) _Py_HashDouble(double);
|
|
|
|
PyAPI_FUNC(long) _Py_HashPointer(void*);
|
2000-06-29 16:17:04 -03:00
|
|
|
|
2001-02-01 16:20:45 -04:00
|
|
|
/* Helper for passing objects to printf and the like */
|
2007-05-18 14:15:44 -03:00
|
|
|
#define PyObject_REPR(obj) PyString_AS_STRING(PyObject_ReprStr8(obj))
|
2001-02-01 16:20:45 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Flag bits for printing: */
|
1995-01-12 07:45:45 -04:00
|
|
|
#define Py_PRINT_RAW 1 /* No string quotes etc. */
|
1990-10-14 09:07:46 -03:00
|
|
|
|
Changes by Greg Stein (code) and GvR (design).
Add a new member to the PyBufferProcs struct, bf_getcharbuffer. For
backward compatibility, this member should only be used (this includes
testing for NULL!) when the flag Py_TPFLAGS_HAVE_GETCHARBUFFER is set
in the type structure, below. Note that if its flag is not set, we
may be looking at an extension module compiled for 1.5.1, which will
have garbage at the bf_getcharbuffer member (because the struct wasn't
as long then). If the flag is one, the pointer may still be NULL.
The function found at this member is used in a similar manner as
bf_getreadbuffer, but it is known to point to 8-bit character data.
(See discussion in getargs.c checked in later.)
As a general feature for extending the type structure and the various
structures that (may) hang off it in a backwards compatible way, we
rename the tp_xxx4 "spare" slot to tp_flags. In 1.5.1 and before,
this slot was always zero. In 1.5.1, it may contain various flags
indicating extra fields that weren't present in 1.5.1. The only flag
defined so far is for the bf_getcharbuffer member of the PyBufferProcs
struct.
Note that the new spares (tp_xxx5 - tp_xxx8), once they become used,
should also be protected by a flag (or flags) in tp_flags.
1998-10-07 23:10:56 -03:00
|
|
|
/*
|
2002-07-07 16:59:50 -03:00
|
|
|
`Type flags (tp_flags)
|
Changes by Greg Stein (code) and GvR (design).
Add a new member to the PyBufferProcs struct, bf_getcharbuffer. For
backward compatibility, this member should only be used (this includes
testing for NULL!) when the flag Py_TPFLAGS_HAVE_GETCHARBUFFER is set
in the type structure, below. Note that if its flag is not set, we
may be looking at an extension module compiled for 1.5.1, which will
have garbage at the bf_getcharbuffer member (because the struct wasn't
as long then). If the flag is one, the pointer may still be NULL.
The function found at this member is used in a similar manner as
bf_getreadbuffer, but it is known to point to 8-bit character data.
(See discussion in getargs.c checked in later.)
As a general feature for extending the type structure and the various
structures that (may) hang off it in a backwards compatible way, we
rename the tp_xxx4 "spare" slot to tp_flags. In 1.5.1 and before,
this slot was always zero. In 1.5.1, it may contain various flags
indicating extra fields that weren't present in 1.5.1. The only flag
defined so far is for the bf_getcharbuffer member of the PyBufferProcs
struct.
Note that the new spares (tp_xxx5 - tp_xxx8), once they become used,
should also be protected by a flag (or flags) in tp_flags.
1998-10-07 23:10:56 -03:00
|
|
|
|
|
|
|
These flags are used to extend the type structure in a backwards-compatible
|
|
|
|
fashion. Extensions can use the flags to indicate (and test) when a given
|
|
|
|
type structure contains a new feature. The Python core will use these when
|
|
|
|
introducing new functionality between major revisions (to avoid mid-version
|
|
|
|
changes in the PYTHON_API_VERSION).
|
|
|
|
|
|
|
|
Arbitration of the flag bit positions will need to be coordinated among
|
|
|
|
all extension writers who publically release their extensions (this will
|
|
|
|
be fewer than you might expect!)..
|
|
|
|
|
2006-07-27 18:53:35 -03:00
|
|
|
Most flags were removed as of Python 3.0 to make room for new flags. (Some
|
|
|
|
flags are not for backwards compatibility but to indicate the presence of an
|
|
|
|
optional feature; these flags remain of course.)
|
Changes by Greg Stein (code) and GvR (design).
Add a new member to the PyBufferProcs struct, bf_getcharbuffer. For
backward compatibility, this member should only be used (this includes
testing for NULL!) when the flag Py_TPFLAGS_HAVE_GETCHARBUFFER is set
in the type structure, below. Note that if its flag is not set, we
may be looking at an extension module compiled for 1.5.1, which will
have garbage at the bf_getcharbuffer member (because the struct wasn't
as long then). If the flag is one, the pointer may still be NULL.
The function found at this member is used in a similar manner as
bf_getreadbuffer, but it is known to point to 8-bit character data.
(See discussion in getargs.c checked in later.)
As a general feature for extending the type structure and the various
structures that (may) hang off it in a backwards compatible way, we
rename the tp_xxx4 "spare" slot to tp_flags. In 1.5.1 and before,
this slot was always zero. In 1.5.1, it may contain various flags
indicating extra fields that weren't present in 1.5.1. The only flag
defined so far is for the bf_getcharbuffer member of the PyBufferProcs
struct.
Note that the new spares (tp_xxx5 - tp_xxx8), once they become used,
should also be protected by a flag (or flags) in tp_flags.
1998-10-07 23:10:56 -03:00
|
|
|
|
|
|
|
Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value.
|
|
|
|
|
|
|
|
Code can use PyType_HasFeature(type_ob, flag_value) to test whether the
|
|
|
|
given type object has a specified feature.
|
|
|
|
*/
|
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
/* Set if the type object is dynamically allocated */
|
|
|
|
#define Py_TPFLAGS_HEAPTYPE (1L<<9)
|
|
|
|
|
|
|
|
/* Set if the type allows subclassing */
|
|
|
|
#define Py_TPFLAGS_BASETYPE (1L<<10)
|
|
|
|
|
2001-08-10 14:37:02 -03:00
|
|
|
/* Set if the type is 'ready' -- fully initialized */
|
|
|
|
#define Py_TPFLAGS_READY (1L<<12)
|
|
|
|
|
|
|
|
/* Set while the type is being 'readied', to prevent recursive ready calls */
|
|
|
|
#define Py_TPFLAGS_READYING (1L<<13)
|
|
|
|
|
2001-08-29 20:46:35 -03:00
|
|
|
/* Objects support garbage collection (see objimp.h) */
|
|
|
|
#define Py_TPFLAGS_HAVE_GC (1L<<14)
|
|
|
|
|
2006-03-07 14:50:55 -04:00
|
|
|
/* These two bits are preserved for Stackless Python, next after this is 17 */
|
2003-05-20 12:14:31 -03:00
|
|
|
#ifdef STACKLESS
|
2003-05-23 09:47:36 -03:00
|
|
|
#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3L<<15)
|
2003-05-20 12:14:31 -03:00
|
|
|
#else
|
2003-05-23 00:33:35 -03:00
|
|
|
#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0
|
2003-05-20 12:14:31 -03:00
|
|
|
#endif
|
|
|
|
|
2007-02-25 16:39:11 -04:00
|
|
|
/* These flags are used to determine if a type is a subclass. */
|
|
|
|
#define Py_TPFLAGS_INT_SUBCLASS (1L<<23)
|
|
|
|
#define Py_TPFLAGS_LONG_SUBCLASS (1L<<24)
|
|
|
|
#define Py_TPFLAGS_LIST_SUBCLASS (1L<<25)
|
|
|
|
#define Py_TPFLAGS_TUPLE_SUBCLASS (1L<<26)
|
|
|
|
#define Py_TPFLAGS_STRING_SUBCLASS (1L<<27)
|
|
|
|
#define Py_TPFLAGS_UNICODE_SUBCLASS (1L<<28)
|
|
|
|
#define Py_TPFLAGS_DICT_SUBCLASS (1L<<29)
|
|
|
|
#define Py_TPFLAGS_BASE_EXC_SUBCLASS (1L<<30)
|
|
|
|
#define Py_TPFLAGS_TYPE_SUBCLASS (1L<<31)
|
|
|
|
|
2001-01-24 18:13:48 -04:00
|
|
|
#define Py_TPFLAGS_DEFAULT ( \
|
2003-05-23 00:33:35 -03:00
|
|
|
Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \
|
2001-01-24 18:13:48 -04:00
|
|
|
0)
|
Changes by Greg Stein (code) and GvR (design).
Add a new member to the PyBufferProcs struct, bf_getcharbuffer. For
backward compatibility, this member should only be used (this includes
testing for NULL!) when the flag Py_TPFLAGS_HAVE_GETCHARBUFFER is set
in the type structure, below. Note that if its flag is not set, we
may be looking at an extension module compiled for 1.5.1, which will
have garbage at the bf_getcharbuffer member (because the struct wasn't
as long then). If the flag is one, the pointer may still be NULL.
The function found at this member is used in a similar manner as
bf_getreadbuffer, but it is known to point to 8-bit character data.
(See discussion in getargs.c checked in later.)
As a general feature for extending the type structure and the various
structures that (may) hang off it in a backwards compatible way, we
rename the tp_xxx4 "spare" slot to tp_flags. In 1.5.1 and before,
this slot was always zero. In 1.5.1, it may contain various flags
indicating extra fields that weren't present in 1.5.1. The only flag
defined so far is for the bf_getcharbuffer member of the PyBufferProcs
struct.
Note that the new spares (tp_xxx5 - tp_xxx8), once they become used,
should also be protected by a flag (or flags) in tp_flags.
1998-10-07 23:10:56 -03:00
|
|
|
|
|
|
|
#define PyType_HasFeature(t,f) (((t)->tp_flags & (f)) != 0)
|
2007-02-25 16:39:11 -04:00
|
|
|
#define PyType_FastSubclass(t,f) PyType_HasFeature(t,f)
|
Changes by Greg Stein (code) and GvR (design).
Add a new member to the PyBufferProcs struct, bf_getcharbuffer. For
backward compatibility, this member should only be used (this includes
testing for NULL!) when the flag Py_TPFLAGS_HAVE_GETCHARBUFFER is set
in the type structure, below. Note that if its flag is not set, we
may be looking at an extension module compiled for 1.5.1, which will
have garbage at the bf_getcharbuffer member (because the struct wasn't
as long then). If the flag is one, the pointer may still be NULL.
The function found at this member is used in a similar manner as
bf_getreadbuffer, but it is known to point to 8-bit character data.
(See discussion in getargs.c checked in later.)
As a general feature for extending the type structure and the various
structures that (may) hang off it in a backwards compatible way, we
rename the tp_xxx4 "spare" slot to tp_flags. In 1.5.1 and before,
this slot was always zero. In 1.5.1, it may contain various flags
indicating extra fields that weren't present in 1.5.1. The only flag
defined so far is for the bf_getcharbuffer member of the PyBufferProcs
struct.
Note that the new spares (tp_xxx5 - tp_xxx8), once they become used,
should also be protected by a flag (or flags) in tp_flags.
1998-10-07 23:10:56 -03:00
|
|
|
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/*
|
1995-01-12 07:45:45 -04:00
|
|
|
The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement
|
2002-07-07 16:59:50 -03:00
|
|
|
reference counts. Py_DECREF calls the object's deallocator function when
|
|
|
|
the refcount falls to 0; for
|
1990-10-14 09:07:46 -03:00
|
|
|
objects that don't contain references to other objects or heap memory
|
|
|
|
this can be the standard function free(). Both macros can be used
|
2002-07-07 16:59:50 -03:00
|
|
|
wherever a void expression is allowed. The argument must not be a
|
|
|
|
NIL pointer. If it may be NIL, use Py_XINCREF/Py_XDECREF instead.
|
|
|
|
The macro _Py_NewReference(op) initialize reference counts to 1, and
|
|
|
|
in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional
|
|
|
|
bookkeeping appropriate to the special build.
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
We assume that the reference count field can never overflow; this can
|
2002-07-07 16:59:50 -03:00
|
|
|
be proven when the size of the field is the same as the pointer size, so
|
|
|
|
we ignore the possibility. Provided a C int is at least 32 bits (which
|
|
|
|
is implicitly assumed in many parts of this code), that's enough for
|
|
|
|
about 2**31 references to an object.
|
|
|
|
|
|
|
|
XXX The following became out of date in Python 2.2, but I'm not sure
|
|
|
|
XXX what the full truth is now. Certainly, heap-allocated type objects
|
|
|
|
XXX can and should be deallocated.
|
1990-10-14 09:07:46 -03:00
|
|
|
Type objects should never be deallocated; the type pointer in an object
|
|
|
|
is not considered to be a reference to the type object, to save
|
|
|
|
complications in the deallocation function. (This is actually a
|
|
|
|
decision that's up to the implementer of each new type so if you want,
|
|
|
|
you can count such references to the type object.)
|
|
|
|
|
1995-01-12 07:45:45 -04:00
|
|
|
*** WARNING*** The Py_DECREF macro must have a side-effect-free argument
|
1990-10-14 09:07:46 -03:00
|
|
|
since it may evaluate its argument multiple times. (The alternative
|
|
|
|
would be to mace it a proper function or assign it to a global temporary
|
|
|
|
variable first, both of which are slower; and in a multi-threaded
|
|
|
|
environment the global variable trick is not safe.)
|
|
|
|
*/
|
|
|
|
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
/* First define a pile of simple helper macros, one set per special
|
|
|
|
* build symbol. These either expand to the obvious things, or to
|
|
|
|
* nothing at all when the special mode isn't in effect. The main
|
|
|
|
* macros can later be defined just once then, yet expand to different
|
|
|
|
* things depending on which special build options are and aren't in effect.
|
|
|
|
* Trust me <wink>: while painful, this is 20x easier to understand than,
|
|
|
|
* e.g, defining _Py_NewReference five different times in a maze of nested
|
|
|
|
* #ifdefs (we used to do that -- it was impenetrable).
|
|
|
|
*/
|
2002-07-07 16:59:50 -03:00
|
|
|
#ifdef Py_REF_DEBUG
|
2006-03-04 15:58:13 -04:00
|
|
|
PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname,
|
2002-07-08 23:57:01 -03:00
|
|
|
int lineno, PyObject *op);
|
2006-04-21 07:40:58 -03:00
|
|
|
PyAPI_FUNC(PyObject *) _PyDict_Dummy(void);
|
|
|
|
PyAPI_FUNC(PyObject *) _PySet_Dummy(void);
|
|
|
|
PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_INC_REFTOTAL _Py_RefTotal++
|
|
|
|
#define _Py_DEC_REFTOTAL _Py_RefTotal--
|
|
|
|
#define _Py_REF_DEBUG_COMMA ,
|
|
|
|
#define _Py_CHECK_REFCNT(OP) \
|
2002-07-08 23:57:01 -03:00
|
|
|
{ if ((OP)->ob_refcnt < 0) \
|
|
|
|
_Py_NegativeRefcount(__FILE__, __LINE__, \
|
|
|
|
(PyObject *)(OP)); \
|
|
|
|
}
|
2002-07-07 16:59:50 -03:00
|
|
|
#else
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_INC_REFTOTAL
|
|
|
|
#define _Py_DEC_REFTOTAL
|
|
|
|
#define _Py_REF_DEBUG_COMMA
|
|
|
|
#define _Py_CHECK_REFCNT(OP) /* a semicolon */;
|
2002-07-10 03:34:15 -03:00
|
|
|
#endif /* Py_REF_DEBUG */
|
2002-07-07 16:59:50 -03:00
|
|
|
|
|
|
|
#ifdef COUNT_ALLOCS
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(void) inc_count(PyTypeObject *);
|
2006-04-21 07:40:58 -03:00
|
|
|
PyAPI_FUNC(void) dec_count(PyTypeObject *);
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_INC_TPALLOCS(OP) inc_count((OP)->ob_type)
|
2006-04-21 07:40:58 -03:00
|
|
|
#define _Py_INC_TPFREES(OP) dec_count((OP)->ob_type)
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_DEC_TPFREES(OP) (OP)->ob_type->tp_frees--
|
|
|
|
#define _Py_COUNT_ALLOCS_COMMA ,
|
2002-07-07 16:59:50 -03:00
|
|
|
#else
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_INC_TPALLOCS(OP)
|
|
|
|
#define _Py_INC_TPFREES(OP)
|
|
|
|
#define _Py_DEC_TPFREES(OP)
|
|
|
|
#define _Py_COUNT_ALLOCS_COMMA
|
2002-07-10 03:34:15 -03:00
|
|
|
#endif /* COUNT_ALLOCS */
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1996-08-12 18:31:32 -03:00
|
|
|
#ifdef Py_TRACE_REFS
|
2002-07-07 16:59:50 -03:00
|
|
|
/* Py_TRACE_REFS is such major surgery that we call external routines. */
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(void) _Py_NewReference(PyObject *);
|
|
|
|
PyAPI_FUNC(void) _Py_ForgetReference(PyObject *);
|
|
|
|
PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
|
|
|
|
PyAPI_FUNC(void) _Py_PrintReferences(FILE *);
|
2003-04-17 16:52:29 -03:00
|
|
|
PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *);
|
2003-03-23 13:52:28 -04:00
|
|
|
PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2002-07-07 16:59:50 -03:00
|
|
|
#else
|
|
|
|
/* Without Py_TRACE_REFS, there's little enough to do that we expand code
|
|
|
|
* inline.
|
|
|
|
*/
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_NewReference(op) ( \
|
|
|
|
_Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA \
|
|
|
|
_Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \
|
2002-07-07 16:59:50 -03:00
|
|
|
(op)->ob_refcnt = 1)
|
1993-10-11 09:54:31 -03:00
|
|
|
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define _Py_ForgetReference(op) _Py_INC_TPFREES(op)
|
1996-05-22 13:33:22 -03:00
|
|
|
|
2002-07-10 03:34:15 -03:00
|
|
|
#define _Py_Dealloc(op) ( \
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
_Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA \
|
2002-07-07 16:59:50 -03:00
|
|
|
(*(op)->ob_type->tp_dealloc)((PyObject *)(op)))
|
1996-05-22 13:33:22 -03:00
|
|
|
#endif /* !Py_TRACE_REFS */
|
|
|
|
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define Py_INCREF(op) ( \
|
|
|
|
_Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \
|
2002-07-07 16:59:50 -03:00
|
|
|
(op)->ob_refcnt++)
|
|
|
|
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 03:23:50 -03:00
|
|
|
#define Py_DECREF(op) \
|
|
|
|
if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \
|
|
|
|
--(op)->ob_refcnt != 0) \
|
|
|
|
_Py_CHECK_REFCNT(op) \
|
|
|
|
else \
|
1997-08-04 23:30:44 -03:00
|
|
|
_Py_Dealloc((PyObject *)(op))
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
|
|
|
|
* and tp_dealloc implementatons.
|
|
|
|
*
|
|
|
|
* Note that "the obvious" code can be deadly:
|
|
|
|
*
|
|
|
|
* Py_XDECREF(op);
|
|
|
|
* op = NULL;
|
|
|
|
*
|
|
|
|
* Typically, `op` is something like self->containee, and `self` is done
|
|
|
|
* using its `containee` member. In the code sequence above, suppose
|
|
|
|
* `containee` is non-NULL with a refcount of 1. Its refcount falls to
|
|
|
|
* 0 on the first line, which can trigger an arbitrary amount of code,
|
|
|
|
* possibly including finalizers (like __del__ methods or weakref callbacks)
|
|
|
|
* coded in Python, which in turn can release the GIL and allow other threads
|
|
|
|
* to run, etc. Such code may even invoke methods of `self` again, or cause
|
|
|
|
* cyclic gc to trigger, but-- oops! --self->containee still points to the
|
|
|
|
* object being torn down, and it may be in an insane state while being torn
|
|
|
|
* down. This has in fact been a rich historic source of miserable (rare &
|
|
|
|
* hard-to-diagnose) segfaulting (and other) bugs.
|
|
|
|
*
|
|
|
|
* The safe way is:
|
|
|
|
*
|
|
|
|
* Py_CLEAR(op);
|
|
|
|
*
|
|
|
|
* That arranges to set `op` to NULL _before_ decref'ing, so that any code
|
|
|
|
* triggered as a side-effect of `op` getting torn down no longer believes
|
|
|
|
* `op` points to a valid object.
|
|
|
|
*
|
|
|
|
* There are cases where it's safe to use the naive code, but they're brittle.
|
|
|
|
* For example, if `op` points to a Python integer, you know that destroying
|
|
|
|
* one of those can't cause problems -- but in part that relies on that
|
|
|
|
* Python integers aren't currently weakly referencable. Best practice is
|
|
|
|
* to use Py_CLEAR() even if you can't think of a reason for why you need to.
|
|
|
|
*/
|
2004-07-14 16:07:35 -03:00
|
|
|
#define Py_CLEAR(op) \
|
|
|
|
do { \
|
|
|
|
if (op) { \
|
2004-09-01 04:02:44 -03:00
|
|
|
PyObject *tmp = (PyObject *)(op); \
|
2004-07-14 16:07:35 -03:00
|
|
|
(op) = NULL; \
|
|
|
|
Py_DECREF(tmp); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* Macros to use in case the object pointer may be NULL: */
|
1995-01-12 07:45:45 -04:00
|
|
|
#define Py_XINCREF(op) if ((op) == NULL) ; else Py_INCREF(op)
|
|
|
|
#define Py_XDECREF(op) if ((op) == NULL) ; else Py_DECREF(op)
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2004-04-22 14:23:49 -03:00
|
|
|
/*
|
|
|
|
These are provided as conveniences to Python runtime embedders, so that
|
|
|
|
they can have object code that is not dependent on Python compilation flags.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(void) Py_IncRef(PyObject *);
|
|
|
|
PyAPI_FUNC(void) Py_DecRef(PyObject *);
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/*
|
1995-01-12 07:45:45 -04:00
|
|
|
_Py_NoneStruct is an object of undefined type which can be used in contexts
|
1990-10-14 09:07:46 -03:00
|
|
|
where NULL (nil) is not suitable (since NULL often means 'error').
|
|
|
|
|
1995-01-12 07:45:45 -04:00
|
|
|
Don't forget to apply Py_INCREF() when returning this value!!!
|
1990-10-14 09:07:46 -03:00
|
|
|
*/
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
|
1995-01-12 07:45:45 -04:00
|
|
|
#define Py_None (&_Py_NoneStruct)
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2003-10-19 18:19:40 -03:00
|
|
|
/* Macro for returning Py_None from a function */
|
2004-07-21 22:46:43 -03:00
|
|
|
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
|
2003-10-19 18:19:40 -03:00
|
|
|
|
2001-01-03 21:31:50 -04:00
|
|
|
/*
|
|
|
|
Py_NotImplemented is a singleton used to signal that an operation is
|
|
|
|
not implemented for a given type combination.
|
|
|
|
*/
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */
|
2001-01-03 21:31:50 -04:00
|
|
|
#define Py_NotImplemented (&_Py_NotImplementedStruct)
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2001-01-17 11:20:39 -04:00
|
|
|
/* Rich comparison opcodes */
|
|
|
|
#define Py_LT 0
|
|
|
|
#define Py_LE 1
|
|
|
|
#define Py_EQ 2
|
|
|
|
#define Py_NE 3
|
|
|
|
#define Py_GT 4
|
|
|
|
#define Py_GE 5
|
|
|
|
|
2004-09-22 23:39:37 -03:00
|
|
|
/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
|
|
|
|
* Defined in object.c.
|
|
|
|
*/
|
|
|
|
PyAPI_DATA(int) _Py_SwappedOp[];
|
|
|
|
|
1994-08-01 08:34:53 -03:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/*
|
|
|
|
More conventions
|
|
|
|
================
|
|
|
|
|
|
|
|
Argument Checking
|
|
|
|
-----------------
|
|
|
|
|
|
|
|
Functions that take objects as arguments normally don't check for nil
|
|
|
|
arguments, but they do check the type of the argument, and return an
|
|
|
|
error if the function doesn't apply to the type.
|
|
|
|
|
|
|
|
Failure Modes
|
|
|
|
-------------
|
|
|
|
|
|
|
|
Functions may fail for a variety of reasons, including running out of
|
1990-12-20 11:06:42 -04:00
|
|
|
memory. This is communicated to the caller in two ways: an error string
|
|
|
|
is set (see errors.h), and the function result differs: functions that
|
|
|
|
normally return a pointer return NULL for failure, functions returning
|
|
|
|
an integer return -1 (which could be a legal return value too!), and
|
|
|
|
other functions return 0 for success and -1 for failure.
|
2002-07-07 16:59:50 -03:00
|
|
|
Callers should always check for errors before using the result. If
|
|
|
|
an error was set, the caller must either explicitly clear it, or pass
|
|
|
|
the error on to its caller.
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
Reference Counts
|
|
|
|
----------------
|
|
|
|
|
|
|
|
It takes a while to get used to the proper usage of reference counts.
|
|
|
|
|
|
|
|
Functions that create an object set the reference count to 1; such new
|
1995-01-12 07:45:45 -04:00
|
|
|
objects must be stored somewhere or destroyed again with Py_DECREF().
|
2003-11-09 12:38:39 -04:00
|
|
|
Some functions that 'store' objects, such as PyTuple_SetItem() and
|
|
|
|
PyList_SetItem(),
|
1990-10-14 09:07:46 -03:00
|
|
|
don't increment the reference count of the object, since the most
|
|
|
|
frequent use is to store a fresh object. Functions that 'retrieve'
|
2003-11-09 12:38:39 -04:00
|
|
|
objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also
|
1995-01-12 07:45:45 -04:00
|
|
|
don't increment
|
1990-10-14 09:07:46 -03:00
|
|
|
the reference count, since most frequently the object is only looked at
|
|
|
|
quickly. Thus, to retrieve an object and store it again, the caller
|
1995-01-12 07:45:45 -04:00
|
|
|
must call Py_INCREF() explicitly.
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2003-11-09 12:38:39 -04:00
|
|
|
NOTE: functions that 'consume' a reference count, like
|
|
|
|
PyList_SetItem(), consume the reference even if the object wasn't
|
|
|
|
successfully stored, to simplify error handling.
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
It seems attractive to make other functions that take an object as
|
2003-11-09 12:38:39 -04:00
|
|
|
argument consume a reference count; however, this may quickly get
|
1990-10-14 09:07:46 -03:00
|
|
|
confusing (even the current practice is already confusing). Consider
|
1995-01-12 07:45:45 -04:00
|
|
|
it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at
|
1990-10-14 09:07:46 -03:00
|
|
|
times.
|
|
|
|
*/
|
1993-07-28 06:05:47 -03:00
|
|
|
|
2000-03-13 12:01:29 -04:00
|
|
|
|
2002-07-07 02:13:56 -03:00
|
|
|
/* Trashcan mechanism, thanks to Christian Tismer.
|
2000-03-13 12:01:29 -04:00
|
|
|
|
2002-07-07 02:13:56 -03:00
|
|
|
When deallocating a container object, it's possible to trigger an unbounded
|
|
|
|
chain of deallocations, as each Py_DECREF in turn drops the refcount on "the
|
|
|
|
next" object in the chain to 0. This can easily lead to stack faults, and
|
|
|
|
especially in threads (which typically have less stack space to work with).
|
2000-03-13 12:01:29 -04:00
|
|
|
|
2002-07-07 02:13:56 -03:00
|
|
|
A container object that participates in cyclic gc can avoid this by
|
|
|
|
bracketing the body of its tp_dealloc function with a pair of macros:
|
|
|
|
|
|
|
|
static void
|
|
|
|
mytype_dealloc(mytype *p)
|
|
|
|
{
|
|
|
|
... declarations go here ...
|
|
|
|
|
|
|
|
PyObject_GC_UnTrack(p); // must untrack first
|
|
|
|
Py_TRASHCAN_SAFE_BEGIN(p)
|
|
|
|
... The body of the deallocator goes here, including all calls ...
|
|
|
|
... to Py_DECREF on contained objects. ...
|
|
|
|
Py_TRASHCAN_SAFE_END(p)
|
|
|
|
}
|
|
|
|
|
2002-08-07 17:53:05 -03:00
|
|
|
CAUTION: Never return from the middle of the body! If the body needs to
|
|
|
|
"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END
|
|
|
|
call, and goto it. Else the call-depth counter (see below) will stay
|
|
|
|
above 0 forever, and the trashcan will never get emptied.
|
|
|
|
|
2002-07-07 02:13:56 -03:00
|
|
|
How it works: The BEGIN macro increments a call-depth counter. So long
|
|
|
|
as this counter is small, the body of the deallocator is run directly without
|
|
|
|
further ado. But if the counter gets large, it instead adds p to a list of
|
|
|
|
objects to be deallocated later, skips the body of the deallocator, and
|
|
|
|
resumes execution after the END macro. The tp_dealloc routine then returns
|
|
|
|
without deallocating anything (and so unbounded call-stack depth is avoided).
|
|
|
|
|
|
|
|
When the call stack finishes unwinding again, code generated by the END macro
|
|
|
|
notices this, and calls another routine to deallocate all the objects that
|
|
|
|
may have been added to the list of deferred deallocations. In effect, a
|
|
|
|
chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces,
|
|
|
|
with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
|
|
|
|
*/
|
2000-03-13 12:01:29 -04:00
|
|
|
|
2002-07-29 10:42:14 -03:00
|
|
|
PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
|
|
|
|
PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
|
|
|
|
PyAPI_DATA(int) _PyTrash_delete_nesting;
|
|
|
|
PyAPI_DATA(PyObject *) _PyTrash_delete_later;
|
2000-03-13 12:01:29 -04:00
|
|
|
|
2002-07-07 02:13:56 -03:00
|
|
|
#define PyTrash_UNWIND_LEVEL 50
|
2000-03-13 12:01:29 -04:00
|
|
|
|
2002-07-07 02:13:56 -03:00
|
|
|
#define Py_TRASHCAN_SAFE_BEGIN(op) \
|
|
|
|
if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
|
|
|
|
++_PyTrash_delete_nesting;
|
|
|
|
/* The body of the deallocator is here. */
|
|
|
|
#define Py_TRASHCAN_SAFE_END(op) \
|
|
|
|
--_PyTrash_delete_nesting; \
|
|
|
|
if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \
|
|
|
|
_PyTrash_destroy_chain(); \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
_PyTrash_deposit_object((PyObject*)op);
|
2000-04-24 12:40:53 -03:00
|
|
|
|
1993-07-28 06:05:47 -03:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* !Py_OBJECT_H */
|