cpython-lru_cache-weakref: Objects/classobject.c annotate

annotate Objects/classobject.c @ 58765:2ba7677bfa95 legacy-trunk

testCopysign was defined twice in test_math; combine the definitions

author	Mark Dickinson <dickinsm@gmail.com>
date	Sat, 06 Feb 2010 23:11:25 +0000
parents	5d2b66e01968
children	7b8ba019cd15

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Class object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	4 #include "Python.h"
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	5 #include "structmember.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
45189 a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	7 /* Free list for method objects to safe malloc/free overhead
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	8 * The im_self element is used to chain the elements.
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	9 */
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	10 static PyMethodObject *free_list;
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	11 static int numfree = 0;
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45189 diff changeset	12 #ifndef PyMethod_MAXFREELIST
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45189 diff changeset	13 #define PyMethod_MAXFREELIST 256
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45189 diff changeset	14 #endif
45189 a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	15
20501 733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	16 #define TP_DESCR_GET(t) \
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	17 (PyType_HasFeature(t, Py_TPFLAGS_HAVE_CLASS) ? (t)->tp_descr_get : NULL)
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	18
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	19 /* Forward */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13430 diff changeset	20 static PyObject class_lookup(PyClassObject , PyObject *,
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13430 diff changeset	21 PyClassObject **);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13430 diff changeset	22 static PyObject instance_getattr1(PyInstanceObject , PyObject *);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13430 diff changeset	23 static PyObject instance_getattr2(PyInstanceObject , PyObject *);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	24
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	25 static PyObject getattrstr, setattrstr, *delattrstr;
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	26
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	27
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	28 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	29 PyClass_New(PyObject bases, PyObject dict, PyObject *name)
0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	30 /* bases is NULL or tuple of classobjects! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	32 PyClassObject op, dummy;
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	33 static PyObject docstr, modstr, *namestr;
4086 831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	34 if (docstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	35 docstr= PyString_InternFromString("__doc__");
4086 831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	36 if (docstr == NULL)
831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	37 return NULL;
831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	38 }
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	39 if (modstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	40 modstr= PyString_InternFromString("__module__");
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	41 if (modstr == NULL)
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	42 return NULL;
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	43 }
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	44 if (namestr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	45 namestr= PyString_InternFromString("__name__");
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	46 if (namestr == NULL)
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	47 return NULL;
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	48 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	49 if (name == NULL \|\| !PyString_Check(name)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	50 PyErr_SetString(PyExc_TypeError,
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	51 "PyClass_New: name must be a string");
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	52 return NULL;
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	53 }
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	54 if (dict == NULL \|\| !PyDict_Check(dict)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	55 PyErr_SetString(PyExc_TypeError,
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	56 "PyClass_New: dict must be a dictionary");
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	57 return NULL;
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	58 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	59 if (PyDict_GetItem(dict, docstr) == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	60 if (PyDict_SetItem(dict, docstr, Py_None) < 0)
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	61 return NULL;
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	62 }
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	63 if (PyDict_GetItem(dict, modstr) == NULL) {
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	64 PyObject *globals = PyEval_GetGlobals();
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	65 if (globals != NULL) {
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	66 PyObject *modname = PyDict_GetItem(globals, namestr);
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	67 if (modname != NULL) {
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	68 if (PyDict_SetItem(dict, modstr, modname) < 0)
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	69 return NULL;
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	70 }
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	71 }
904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	72 }
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	73 if (bases == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	74 bases = PyTuple_New(0);
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	75 if (bases == NULL)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1215 diff changeset	76 return NULL;
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	77 }
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	78 else {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	79 Py_ssize_t i, n;
19805 560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	80 PyObject *base;
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	81 if (!PyTuple_Check(bases)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	82 PyErr_SetString(PyExc_TypeError,
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	83 "PyClass_New: bases must be a tuple");
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	84 return NULL;
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	85 }
19805 560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	86 n = PyTuple_Size(bases);
560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	87 for (i = 0; i < n; i++) {
560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	88 base = PyTuple_GET_ITEM(bases, i);
560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	89 if (!PyClass_Check(base)) {
560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	90 if (PyCallable_Check(
560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	91 (PyObject *) base->ob_type))
38314 1fdf29a88f0e Replace PyObject_CallFunction calls with only object args Georg Brandl <georg@python.org> parents: 37920 diff changeset	92 return PyObject_CallFunctionObjArgs(
19805 560155e75087 PyClass_New(): put the extended Don Beaudry hook back in. When one of Guido van Rossum <guido@python.org> parents: 19751 diff changeset	93 (PyObject *) base->ob_type,
38314 1fdf29a88f0e Replace PyObject_CallFunction calls with only object args Georg Brandl <georg@python.org> parents: 37920 diff changeset	94 name, bases, dict, NULL);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	95 PyErr_SetString(PyExc_TypeError,
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	96 "PyClass_New: base must be a class");
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	97 return NULL;
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	98 }
e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	99 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	100 Py_INCREF(bases);
6430 e78b6174bec9 Check that all base classes are indeed class objects, rather than Guido van Rossum <guido@python.org> parents: 6309 diff changeset	101 }
39582 a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	102
a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	103 if (getattrstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	104 getattrstr = PyString_InternFromString("__getattr__");
39582 a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	105 if (getattrstr == NULL)
a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	106 goto alloc_error;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	107 setattrstr = PyString_InternFromString("__setattr__");
39582 a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	108 if (setattrstr == NULL)
a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	109 goto alloc_error;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	110 delattrstr = PyString_InternFromString("__delattr__");
39582 a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	111 if (delattrstr == NULL)
a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	112 goto alloc_error;
a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	113 }
a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	114
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	115 op = PyObject_GC_New(PyClassObject, &PyClass_Type);
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	116 if (op == NULL) {
39582 a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	117 alloc_error:
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	118 Py_DECREF(bases);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	119 return NULL;
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	120 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	121 op->cl_bases = bases;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	122 Py_INCREF(dict);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	123 op->cl_dict = dict;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	124 Py_XINCREF(name);
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	125 op->cl_name = name;
39582 a745a2bd48af Move initialization of interned strings to before allocating the Neal Norwitz <nnorwitz@gmail.com> parents: 39481 diff changeset	126
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	127 op->cl_getattr = class_lookup(op, getattrstr, &dummy);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	128 op->cl_setattr = class_lookup(op, setattrstr, &dummy);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	129 op->cl_delattr = class_lookup(op, delattrstr, &dummy);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	130 Py_XINCREF(op->cl_getattr);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	131 Py_XINCREF(op->cl_setattr);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	132 Py_XINCREF(op->cl_delattr);
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	133 _PyObject_GC_TRACK(op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	134 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	135 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	136
19751 3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	137 PyObject *
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	138 PyMethod_Function(PyObject *im)
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	139 {
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	140 if (!PyMethod_Check(im)) {
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	141 PyErr_BadInternalCall();
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	142 return NULL;
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	143 }
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	144 return ((PyMethodObject *)im)->im_func;
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	145 }
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	146
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	147 PyObject *
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	148 PyMethod_Self(PyObject *im)
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	149 {
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	150 if (!PyMethod_Check(im)) {
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	151 PyErr_BadInternalCall();
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	152 return NULL;
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	153 }
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	154 return ((PyMethodObject *)im)->im_self;
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	155 }
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	156
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	157 PyObject *
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	158 PyMethod_Class(PyObject *im)
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	159 {
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	160 if (!PyMethod_Check(im)) {
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	161 PyErr_BadInternalCall();
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	162 return NULL;
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	163 }
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	164 return ((PyMethodObject *)im)->im_class;
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	165 }
3d76dfc34c57 Add PyMethod_Function(), PyMethod_Self(), PyMethod_Class() back. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	166
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	167 PyDoc_STRVAR(class_doc,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	168 "classobj(name, bases, dict)\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	169 \n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	170 Create a class object. The name must be a string; the second argument\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	171 a tuple of classes, and the third a dictionary.");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	172
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	173 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	174 class_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	175 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	176 PyObject name, bases, *dict;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36558 diff changeset	177 static char *kwlist[] = {"name", "bases", "dict", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	178
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	179 if (!PyArg_ParseTupleAndKeywords(args, kwds, "SOO", kwlist,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	180 &name, &bases, &dict))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	181 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	182 return PyClass_New(bases, dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	183 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	184
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	185 /* Class methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	186
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	187 static void
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	188 class_dealloc(PyClassObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	189 {
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	190 _PyObject_GC_UNTRACK(op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	191 Py_DECREF(op->cl_bases);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	192 Py_DECREF(op->cl_dict);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	193 Py_XDECREF(op->cl_name);
8806 8e9d2146ae93 Fix a memory leak -- the cached values of __getattr__ etc. were never Guido van Rossum <guido@python.org> parents: 8657 diff changeset	194 Py_XDECREF(op->cl_getattr);
8e9d2146ae93 Fix a memory leak -- the cached values of __getattr__ etc. were never Guido van Rossum <guido@python.org> parents: 8657 diff changeset	195 Py_XDECREF(op->cl_setattr);
8e9d2146ae93 Fix a memory leak -- the cached values of __getattr__ etc. were never Guido van Rossum <guido@python.org> parents: 8657 diff changeset	196 Py_XDECREF(op->cl_delattr);
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	197 PyObject_GC_Del(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	198 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	199
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	200 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	201 class_lookup(PyClassObject cp, PyObject name, PyClassObject **pclass)
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	202 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	203 Py_ssize_t i, n;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	204 PyObject *value = PyDict_GetItem(cp->cl_dict, name);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	205 if (value != NULL) {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	206 *pclass = cp;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	207 return value;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	208 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	209 n = PyTuple_Size(cp->cl_bases);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	210 for (i = 0; i < n; i++) {
6309 904a4d783a33 When creating a class, set its __module__ attribute to the module Guido van Rossum <guido@python.org> parents: 6155 diff changeset	211 /* XXX What if one of the bases is not a class? */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	212 PyObject *v = class_lookup(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	213 (PyClassObject *)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	214 PyTuple_GetItem(cp->cl_bases, i), name, pclass);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	215 if (v != NULL)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	216 return v;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	217 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	218 return NULL;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	219 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	220
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	221 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	222 class_getattr(register PyClassObject op, PyObject name)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	223 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	224 register PyObject *v;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	225 register char *sname = PyString_AsString(name);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	226 PyClassObject *klass;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	227 descrgetfunc f;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	228
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	229 if (sname[0] == '_' && sname[1] == '_') {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	230 if (strcmp(sname, "__dict__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	231 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	232 PyErr_SetString(PyExc_RuntimeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	233 "class.__dict__ not accessible in restricted mode");
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	234 return NULL;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	235 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	236 Py_INCREF(op->cl_dict);
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	237 return op->cl_dict;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	238 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	239 if (strcmp(sname, "__bases__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	240 Py_INCREF(op->cl_bases);
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	241 return op->cl_bases;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	242 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	243 if (strcmp(sname, "__name__") == 0) {
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	244 if (op->cl_name == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	245 v = Py_None;
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	246 else
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	247 v = op->cl_name;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	248 Py_INCREF(v);
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	249 return v;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	250 }
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	251 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	252 v = class_lookup(op, name, &klass);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	253 if (v == NULL) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	254 PyErr_Format(PyExc_AttributeError,
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	255 "class %.50s has no attribute '%.400s'",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	256 PyString_AS_STRING(op->cl_name), sname);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	257 return NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	258 }
20501 733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	259 f = TP_DESCR_GET(v->ob_type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	260 if (f == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	261 Py_INCREF(v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	262 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	263 v = f(v, (PyObject )NULL, (PyObject )op);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	264 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	265 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	266
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	267 static void
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	268 set_slot(PyObject *slot, PyObject v)
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	269 {
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	270 PyObject temp = slot;
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	271 Py_XINCREF(v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	272 *slot = v;
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	273 Py_XDECREF(temp);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	274 }
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	275
8649 9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	276 static void
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	277 set_attr_slots(PyClassObject *c)
8649 9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	278 {
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	279 PyClassObject *dummy;
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	280
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	281 set_slot(&c->cl_getattr, class_lookup(c, getattrstr, &dummy));
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	282 set_slot(&c->cl_setattr, class_lookup(c, setattrstr, &dummy));
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	283 set_slot(&c->cl_delattr, class_lookup(c, delattrstr, &dummy));
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	284 }
9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	285
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	286 static char *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	287 set_dict(PyClassObject c, PyObject v)
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	288 {
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	289 if (v == NULL \|\| !PyDict_Check(v))
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	290 return "__dict__ must be a dictionary object";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	291 set_slot(&c->cl_dict, v);
8649 9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	292 set_attr_slots(c);
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	293 return "";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	294 }
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	295
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	296 static char *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	297 set_bases(PyClassObject c, PyObject v)
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	298 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	299 Py_ssize_t i, n;
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	300
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	301 if (v == NULL \|\| !PyTuple_Check(v))
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	302 return "__bases__ must be a tuple object";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	303 n = PyTuple_Size(v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	304 for (i = 0; i < n; i++) {
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	305 PyObject *x = PyTuple_GET_ITEM(v, i);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	306 if (!PyClass_Check(x))
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	307 return "__bases__ items must be classes";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	308 if (PyClass_IsSubclass(x, (PyObject *)c))
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	309 return "a __bases__ item causes an inheritance cycle";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	310 }
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	311 set_slot(&c->cl_bases, v);
8649 9af95d7270df Recompute the special getattr/setattr/delattr cache slots after Guido van Rossum <guido@python.org> parents: 8496 diff changeset	312 set_attr_slots(c);
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	313 return "";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	314 }
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	315
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	316 static char *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	317 set_name(PyClassObject c, PyObject v)
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	318 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	319 if (v == NULL \|\| !PyString_Check(v))
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	320 return "__name__ must be a string object";
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	321 if (strlen(PyString_AS_STRING(v)) != (size_t)PyString_GET_SIZE(v))
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	322 return "__name__ must not contain null bytes";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	323 set_slot(&c->cl_name, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	324 return "";
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	325 }
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	326
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	327 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	328 class_setattr(PyClassObject op, PyObject name, PyObject *v)
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	329 {
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	330 char *sname;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	331 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	332 PyErr_SetString(PyExc_RuntimeError,
2889 e513f0d65368 class objects are read-only in restricted mode Guido van Rossum <guido@python.org> parents: 2864 diff changeset	333 "classes are read-only in restricted mode");
e513f0d65368 class objects are read-only in restricted mode Guido van Rossum <guido@python.org> parents: 2864 diff changeset	334 return -1;
e513f0d65368 class objects are read-only in restricted mode Guido van Rossum <guido@python.org> parents: 2864 diff changeset	335 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	336 sname = PyString_AsString(name);
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	337 if (sname[0] == '_' && sname[1] == '_') {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	338 Py_ssize_t n = PyString_Size(name);
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	339 if (sname[n-1] == '_' && sname[n-2] == '_') {
8464 7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	340 char *err = NULL;
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	341 if (strcmp(sname, "__dict__") == 0)
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	342 err = set_dict(op, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	343 else if (strcmp(sname, "__bases__") == 0)
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	344 err = set_bases(op, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	345 else if (strcmp(sname, "__name__") == 0)
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	346 err = set_name(op, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	347 else if (strcmp(sname, "__getattr__") == 0)
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	348 set_slot(&op->cl_getattr, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	349 else if (strcmp(sname, "__setattr__") == 0)
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	350 set_slot(&op->cl_setattr, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	351 else if (strcmp(sname, "__delattr__") == 0)
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	352 set_slot(&op->cl_delattr, v);
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	353 /* For the last three, we fall through to update the
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	354 dictionary as well. */
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	355 if (err != NULL) {
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	356 if (*err == '\0')
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	357 return 0;
7160e529e9a1 Allow assignments to special class attributes -- with typechecks, and Guido van Rossum <guido@python.org> parents: 8438 diff changeset	358 PyErr_SetString(PyExc_TypeError, err);
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	359 return -1;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	360 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	361 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	362 }
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	363 if (v == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	364 int rv = PyDict_DelItem(op->cl_dict, name);
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	365 if (rv < 0)
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	366 PyErr_Format(PyExc_AttributeError,
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	367 "class %.50s has no attribute '%.400s'",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	368 PyString_AS_STRING(op->cl_name), sname);
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	369 return rv;
7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	370 }
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	371 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	372 return PyDict_SetItem(op->cl_dict, name, v);
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	373 }
0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	374
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	375 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	376 class_repr(PyClassObject *op)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	377 {
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	378 PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	379 char *name;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	380 if (op->cl_name == NULL \|\| !PyString_Check(op->cl_name))
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	381 name = "?";
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	382 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	383 name = PyString_AsString(op->cl_name);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	384 if (mod == NULL \|\| !PyString_Check(mod))
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	385 return PyString_FromFormat("<class ?.%s at %p>", name, op);
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	386 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	387 return PyString_FromFormat("<class %s.%s at %p>",
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	388 PyString_AsString(mod),
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19336 diff changeset	389 name, op);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	390 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	391
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	392 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	393 class_str(PyClassObject *op)
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	394 {
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	395 PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	396 PyObject *name = op->cl_name;
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	397 PyObject *res;
37920 ce5585afc20f Fix more ssize_t issues. Martin v. Löwis <martin@v.loewis.de> parents: 37756 diff changeset	398 Py_ssize_t m, n;
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	399
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	400 if (name == NULL \|\| !PyString_Check(name))
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	401 return class_repr(op);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	402 if (mod == NULL \|\| !PyString_Check(mod)) {
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	403 Py_INCREF(name);
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	404 return name;
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	405 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	406 m = PyString_GET_SIZE(mod);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	407 n = PyString_GET_SIZE(name);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	408 res = PyString_FromStringAndSize((char *)NULL, m+1+n);
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	409 if (res != NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	410 char *s = PyString_AS_STRING(res);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	411 memcpy(s, PyString_AS_STRING(mod), m);
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	412 s += m;
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	413 *s++ = '.';
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	414 memcpy(s, PyString_AS_STRING(name), n);
6502 2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	415 }
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	416 return res;
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	417 }
2a2e5b731d1c Write a str() function for class objects that returns Guido van Rossum <guido@python.org> parents: 6430 diff changeset	418
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	419 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	420 class_traverse(PyClassObject o, visitproc visit, void arg)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	421 {
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	422 Py_VISIT(o->cl_bases);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	423 Py_VISIT(o->cl_dict);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	424 Py_VISIT(o->cl_name);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	425 Py_VISIT(o->cl_getattr);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	426 Py_VISIT(o->cl_setattr);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	427 Py_VISIT(o->cl_delattr);
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	428 return 0;
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	429 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	430
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	431 PyTypeObject PyClass_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	432 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	433 0,
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	434 "classobj",
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	435 sizeof(PyClassObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	436 0,
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	437 (destructor)class_dealloc, /* tp_dealloc */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	438 0, /* tp_print */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	439 0, /* tp_getattr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	440 0, /* tp_setattr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	441 0, /* tp_compare */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	442 (reprfunc)class_repr, /* tp_repr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	443 0, /* tp_as_number */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	444 0, /* tp_as_sequence */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	445 0, /* tp_as_mapping */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	446 0, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	447 PyInstance_New, /* tp_call */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	448 (reprfunc)class_str, /* tp_str */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	449 (getattrofunc)class_getattr, /* tp_getattro */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	450 (setattrofunc)class_setattr, /* tp_setattro */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	451 0, /* tp_as_buffer */
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	452 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	453 class_doc, /* tp_doc */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	454 (traverseproc)class_traverse, /* tp_traverse */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	455 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	456 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	457 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	458 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	459 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	460 0, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	461 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	462 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	463 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	464 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	465 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	466 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	467 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	468 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	469 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	470 class_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	471 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	472
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	473 int
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	474 PyClass_IsSubclass(PyObject klass, PyObject base)
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	475 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	476 Py_ssize_t i, n;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	477 PyClassObject *cp;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	478 if (klass == base)
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	479 return 1;
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25941 diff changeset	480 if (PyTuple_Check(base)) {
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25941 diff changeset	481 n = PyTuple_GET_SIZE(base);
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25941 diff changeset	482 for (i = 0; i < n; i++) {
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	483 if (PyClass_IsSubclass(klass, PyTuple_GET_ITEM(base, i)))
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25941 diff changeset	484 return 1;
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25941 diff changeset	485 }
26622 19507a1d0254 Change issubclass() so that recursive tuples (directly or indirectly Walter Dörwald <walter@livinglogic.de> parents: 26612 diff changeset	486 return 0;
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25941 diff changeset	487 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	488 if (klass == NULL \|\| !PyClass_Check(klass))
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	489 return 0;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	490 cp = (PyClassObject *)klass;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	491 n = PyTuple_Size(cp->cl_bases);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	492 for (i = 0; i < n; i++) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	493 if (PyClass_IsSubclass(PyTuple_GetItem(cp->cl_bases, i), base))
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	494 return 1;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	495 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	496 return 0;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	497 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	498
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	499
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	500 /* Instance objects */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	501
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	502 PyObject *
16314 24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	503 PyInstance_NewRaw(PyObject klass, PyObject dict)
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	504 {
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	505 PyInstanceObject *inst;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	506
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	507 if (!PyClass_Check(klass)) {
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	508 PyErr_BadInternalCall();
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	509 return NULL;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	510 }
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	511 if (dict == NULL) {
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	512 dict = PyDict_New();
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	513 if (dict == NULL)
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	514 return NULL;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	515 }
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	516 else {
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	517 if (!PyDict_Check(dict)) {
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	518 PyErr_BadInternalCall();
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	519 return NULL;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	520 }
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	521 Py_INCREF(dict);
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	522 }
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	523 inst = PyObject_GC_New(PyInstanceObject, &PyInstance_Type);
16314 24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	524 if (inst == NULL) {
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	525 Py_DECREF(dict);
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	526 return NULL;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	527 }
17154 3b8a5bbfd2e5 A small change to the C API for weakly-referencable types: Such types Fred Drake <fdrake@acm.org> parents: 16768 diff changeset	528 inst->in_weakreflist = NULL;
16314 24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	529 Py_INCREF(klass);
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	530 inst->in_class = (PyClassObject *)klass;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	531 inst->in_dict = dict;
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	532 _PyObject_GC_TRACK(inst);
16314 24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	533 return (PyObject *)inst;
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	534 }
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	535
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	536 PyObject *
24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	537 PyInstance_New(PyObject klass, PyObject arg, PyObject *kw)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	538 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	539 register PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	540 PyObject *init;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	541 static PyObject *initstr;
16314 24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	542
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	543 if (initstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	544 initstr = PyString_InternFromString("__init__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	545 if (initstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	546 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	547 }
16314 24e457ba1f92 Re-factored PyInstance_New() into PyInstance_New() and PyInstance_NewRaw(). Fred Drake <fdrake@acm.org> parents: 16004 diff changeset	548 inst = (PyInstanceObject *) PyInstance_NewRaw(klass, NULL);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	549 if (inst == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	550 return NULL;
12504 44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	551 init = instance_getattr2(inst, initstr);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	552 if (init == NULL) {
25941 7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	553 if (PyErr_Occurred()) {
7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	554 Py_DECREF(inst);
7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	555 return NULL;
7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	556 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	557 if ((arg != NULL && (!PyTuple_Check(arg) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	558 PyTuple_Size(arg) != 0))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	559 \|\| (kw != NULL && (!PyDict_Check(kw) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	560 PyDict_Size(kw) != 0))) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	561 PyErr_SetString(PyExc_TypeError,
2864 5f951912e995 changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2827 diff changeset	562 "this constructor takes no arguments");
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	563 Py_DECREF(inst);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	564 inst = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	565 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	566 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	567 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	568 PyObject *res = PyEval_CallObjectWithKeywords(init, arg, kw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	569 Py_DECREF(init);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	570 if (res == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	571 Py_DECREF(inst);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	572 inst = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	573 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	574 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	575 if (res != Py_None) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	576 PyErr_SetString(PyExc_TypeError,
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	577 "__init__() should return None");
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	578 Py_DECREF(inst);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	579 inst = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	580 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	581 Py_DECREF(res);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	582 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	583 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	584 return (PyObject *)inst;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	585 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	586
174 20fee4e2eecd Change ugly 'class member' to more normal 'instance'. Guido van Rossum <guido@python.org> parents: 145 diff changeset	587 /* Instance methods */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	588
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	589 PyDoc_STRVAR(instance_doc,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	590 "instance(class[, dict])\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	591 \n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	592 Create an instance without calling its __init__() method.\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	593 The class must be a classic class.\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	594 If present, dict must be a dictionary or None.");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	595
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	596 static PyObject *
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	597 instance_new(PyTypeObject* type, PyObject* args, PyObject *kw)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	598 {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	599 PyObject *klass;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	600 PyObject *dict = Py_None;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	601
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	602 if (!PyArg_ParseTuple(args, "O!\|O:instance",
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	603 &PyClass_Type, &klass, &dict))
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	604 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	605
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	606 if (dict == Py_None)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	607 dict = NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	608 else if (!PyDict_Check(dict)) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	609 PyErr_SetString(PyExc_TypeError,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	610 "instance() second arg must be dictionary or None");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	611 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	612 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	613 return PyInstance_NewRaw(klass, dict);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	614 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	615
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	616
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	617 static void
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	618 instance_dealloc(register PyInstanceObject *inst)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	619 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	620 PyObject error_type, error_value, *error_traceback;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	621 PyObject *del;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	622 static PyObject *delstr;
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	623
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	624 _PyObject_GC_UNTRACK(inst);
20698 b229208a2a72 Be smarter about clearing the weakref lists for instances, instance methods, Fred Drake <fdrake@acm.org> parents: 20601 diff changeset	625 if (inst->in_weakreflist != NULL)
b229208a2a72 Be smarter about clearing the weakref lists for instances, instance methods, Fred Drake <fdrake@acm.org> parents: 20601 diff changeset	626 PyObject_ClearWeakRefs((PyObject *) inst);
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: 16356 diff changeset	627
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	628 /* Temporarily resurrect the object. */
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	629 assert(inst->ob_type == &PyInstance_Type);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	630 assert(inst->ob_refcnt == 0);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	631 inst->ob_refcnt = 1;
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	632
3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	633 /* Save the current exception, if any. */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	634 PyErr_Fetch(&error_type, &error_value, &error_traceback);
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	635 /* Execute __del__ method, if any. */
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	636 if (delstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	637 delstr = PyString_InternFromString("__del__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	638 if (delstr == NULL)
39481 df9478be0627 Can't return NULL from a void function. If there is a memory error, Neal Norwitz <nnorwitz@gmail.com> parents: 39467 diff changeset	639 PyErr_WriteUnraisable((PyObject*)inst);
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	640 }
39481 df9478be0627 Can't return NULL from a void function. If there is a memory error, Neal Norwitz <nnorwitz@gmail.com> parents: 39467 diff changeset	641 if (delstr && (del = instance_getattr2(inst, delstr)) != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	642 PyObject res = PyEval_CallObject(del, (PyObject )NULL);
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	643 if (res == NULL)
14330 6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14180 diff changeset	644 PyErr_WriteUnraisable(del);
4003 138fa15a1032 Disable support for access statement Guido van Rossum <guido@python.org> parents: 3987 diff changeset	645 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	646 Py_DECREF(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	647 Py_DECREF(del);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	648 }
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	649 /* Restore the saved exception. */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	650 PyErr_Restore(error_type, error_value, error_traceback);
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	651
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	652 /* Undo the temporary resurrection; can't use DECREF here, it would
3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	653 * cause a recursive call.
3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	654 */
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	655 assert(inst->ob_refcnt > 0);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	656 if (--inst->ob_refcnt == 0) {
44751 58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	657
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	658 /* New weakrefs could be created during the finalizer call.
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	659 If this occurs, clear them out without calling their
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	660 finalizers since they might rely on part of the object
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	661 being finalized that has already been destroyed. */
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	662 while (inst->in_weakreflist != NULL) {
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	663 _PyWeakref_ClearRef((PyWeakReference *)
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	664 (inst->in_weakreflist));
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	665 }
58303ed72ba1 Fix an edge case whereby the __del__() method of a classic class could Guido van Rossum <guido@python.org> parents: 41634 diff changeset	666
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	667 Py_DECREF(inst->in_class);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	668 Py_XDECREF(inst->in_dict);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	669 PyObject_GC_Del(inst);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	670 }
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	671 else {
37920 ce5585afc20f Fix more ssize_t issues. Martin v. Löwis <martin@v.loewis.de> parents: 37756 diff changeset	672 Py_ssize_t refcnt = inst->ob_refcnt;
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	673 /* __del__ resurrected it! Make it look like the original
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	674 * Py_DECREF never happened.
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	675 */
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	676 _Py_NewReference((PyObject *)inst);
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	677 inst->ob_refcnt = refcnt;
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	678 _PyObject_GC_TRACK(inst);
32916 ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	679 /* If Py_REF_DEBUG, _Py_NewReference bumped _Py_RefTotal, so
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	680 * we need to undo that. */
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	681 _Py_DEC_REFTOTAL;
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	682 /* If Py_TRACE_REFS, _Py_NewReference re-added self to the
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	683 * object chain, so no more to do there.
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	684 * If COUNT_ALLOCS, the original decref bumped tp_frees, and
32916 ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	685 * _Py_NewReference bumped tp_allocs: both of those need to be
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 31003 diff changeset	686 * undone.
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	687 */
3022 c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	688 #ifdef COUNT_ALLOCS
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	689 --inst->ob_type->tp_frees;
c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	690 --inst->ob_type->tp_allocs;
14653 3d6fe64bcd21 Fix for SF bug 110688: Instance deallocation neglected to account for Tim Peters <tim.peters@gmail.com> parents: 14605 diff changeset	691 #endif
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	692 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	693 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	694
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	695 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	696 instance_getattr1(register PyInstanceObject inst, PyObject name)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	697 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	698 register PyObject *v;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	699 register char *sname = PyString_AsString(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	700 if (sname[0] == '_' && sname[1] == '_') {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	701 if (strcmp(sname, "__dict__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	702 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	703 PyErr_SetString(PyExc_RuntimeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	704 "instance.__dict__ not accessible in restricted mode");
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	705 return NULL;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	706 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	707 Py_INCREF(inst->in_dict);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1351 diff changeset	708 return inst->in_dict;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1351 diff changeset	709 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	710 if (strcmp(sname, "__class__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	711 Py_INCREF(inst->in_class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	712 return (PyObject *)inst->in_class;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1351 diff changeset	713 }
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	714 }
12504 44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	715 v = instance_getattr2(inst, name);
25941 7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	716 if (v == NULL && !PyErr_Occurred()) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	717 PyErr_Format(PyExc_AttributeError,
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	718 "%.50s instance has no attribute '%.400s'",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	719 PyString_AS_STRING(inst->in_class->cl_name), sname);
12504 44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	720 }
44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	721 return v;
44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	722 }
44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	723
44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	724 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	725 instance_getattr2(register PyInstanceObject inst, PyObject name)
12504 44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	726 {
44e521a93648 potentially useless optimization Jeremy Hylton <jeremy@alum.mit.edu> parents: 12321 diff changeset	727 register PyObject *v;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	728 PyClassObject *klass;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	729 descrgetfunc f;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	730
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	731 v = PyDict_GetItem(inst->in_dict, name);
19334 60264d1e100e instance_getattr2(): rewritten to remove unnecessary stuff and Guido van Rossum <guido@python.org> parents: 19332 diff changeset	732 if (v != NULL) {
60264d1e100e instance_getattr2(): rewritten to remove unnecessary stuff and Guido van Rossum <guido@python.org> parents: 19332 diff changeset	733 Py_INCREF(v);
60264d1e100e instance_getattr2(): rewritten to remove unnecessary stuff and Guido van Rossum <guido@python.org> parents: 19332 diff changeset	734 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	735 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	736 v = class_lookup(inst->in_class, name, &klass);
19334 60264d1e100e instance_getattr2(): rewritten to remove unnecessary stuff and Guido van Rossum <guido@python.org> parents: 19332 diff changeset	737 if (v != NULL) {
60264d1e100e instance_getattr2(): rewritten to remove unnecessary stuff and Guido van Rossum <guido@python.org> parents: 19332 diff changeset	738 Py_INCREF(v);
20501 733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	739 f = TP_DESCR_GET(v->ob_type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	740 if (f != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	741 PyObject w = f(v, (PyObject )inst,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	742 (PyObject *)(inst->in_class));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	743 Py_DECREF(v);
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	744 v = w;
e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	745 }
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	746 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	747 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	748 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	749
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	750 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	751 instance_getattr(register PyInstanceObject inst, PyObject name)
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	752 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	753 register PyObject func, res;
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	754 res = instance_getattr1(inst, name);
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	755 if (res == NULL && (func = inst->in_class->cl_getattr) != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	756 PyObject *args;
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	757 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	758 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	759 PyErr_Clear();
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	760 args = PyTuple_Pack(2, inst, name);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	761 if (args == NULL)
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	762 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	763 res = PyEval_CallObject(func, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	764 Py_DECREF(args);
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	765 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	766 return res;
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	767 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	768
28519 2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	769 /* See classobject.h comments: this only does dict lookups, and is always
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	770 * safe to call.
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	771 */
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	772 PyObject *
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	773 _PyInstance_Lookup(PyObject pinst, PyObject name)
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	774 {
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	775 PyObject *v;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	776 PyClassObject *klass;
28519 2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	777 PyInstanceObject inst; / pinst cast to the right type */
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	778
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	779 assert(PyInstance_Check(pinst));
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	780 inst = (PyInstanceObject *)pinst;
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	781
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	782 assert(PyString_Check(name));
28519 2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	783
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	784 v = PyDict_GetItem(inst->in_dict, name);
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	785 if (v == NULL)
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	786 v = class_lookup(inst->in_class, name, &klass);
28519 2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	787 return v;
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	788 }
2a3095a415b1 New private API function _PyInstance_Lookup. gc will use this to figure Tim Peters <tim.peters@gmail.com> parents: 27817 diff changeset	789
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	790 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	791 instance_setattr1(PyInstanceObject inst, PyObject name, PyObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	792 {
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	793 if (v == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	794 int rv = PyDict_DelItem(inst->in_dict, name);
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	795 if (rv < 0)
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	796 PyErr_Format(PyExc_AttributeError,
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15010 diff changeset	797 "%.50s instance has no attribute '%.400s'",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	798 PyString_AS_STRING(inst->in_class->cl_name),
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	799 PyString_AS_STRING(name));
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	800 return rv;
7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	801 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	802 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	803 return PyDict_SetItem(inst->in_dict, name, v);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	804 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	805
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	806 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	807 instance_setattr(PyInstanceObject inst, PyObject name, PyObject *v)
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	808 {
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	809 PyObject func, args, res, tmp;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	810 char *sname = PyString_AsString(name);
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	811 if (sname[0] == '_' && sname[1] == '_') {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	812 Py_ssize_t n = PyString_Size(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	813 if (sname[n-1] == '_' && sname[n-2] == '_') {
6155 47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	814 if (strcmp(sname, "__dict__") == 0) {
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	815 if (PyEval_GetRestricted()) {
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	816 PyErr_SetString(PyExc_RuntimeError,
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	817 "__dict__ not accessible in restricted mode");
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	818 return -1;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	819 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	820 if (v == NULL \|\| !PyDict_Check(v)) {
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	821 PyErr_SetString(PyExc_TypeError,
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	822 "__dict__ must be set to a dictionary");
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	823 return -1;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	824 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	825 tmp = inst->in_dict;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	826 Py_INCREF(v);
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	827 inst->in_dict = v;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	828 Py_DECREF(tmp);
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	829 return 0;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	830 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	831 if (strcmp(sname, "__class__") == 0) {
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	832 if (PyEval_GetRestricted()) {
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	833 PyErr_SetString(PyExc_RuntimeError,
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	834 "__class__ not accessible in restricted mode");
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	835 return -1;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	836 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	837 if (v == NULL \|\| !PyClass_Check(v)) {
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	838 PyErr_SetString(PyExc_TypeError,
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	839 "__class__ must be set to a class");
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	840 return -1;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	841 }
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	842 tmp = (PyObject *)(inst->in_class);
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	843 Py_INCREF(v);
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	844 inst->in_class = (PyClassObject *)v;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	845 Py_DECREF(tmp);
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	846 return 0;
47867006f076 Allow assignments to instance.__dict__ and instance.__class__. The Guido van Rossum <guido@python.org> parents: 5932 diff changeset	847 }
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	848 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	849 }
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	850 if (v == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	851 func = inst->in_class->cl_delattr;
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	852 else
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	853 func = inst->in_class->cl_setattr;
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	854 if (func == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	855 return instance_setattr1(inst, name, v);
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	856 if (v == NULL)
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	857 args = PyTuple_Pack(2, inst, name);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	858 else
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	859 args = PyTuple_Pack(3, inst, name, v);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	860 if (args == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	861 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	862 res = PyEval_CallObject(func, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	863 Py_DECREF(args);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	864 if (res == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	865 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	866 Py_DECREF(res);
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	867 return 0;
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	868 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	869
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	870 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	871 instance_repr(PyInstanceObject *inst)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	872 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	873 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	874 PyObject *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	875 static PyObject *reprstr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	876
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	877 if (reprstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	878 reprstr = PyString_InternFromString("__repr__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	879 if (reprstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	880 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	881 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	882 func = instance_getattr(inst, reprstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	883 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	884 PyObject classname, mod;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	885 char *cname;
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	886 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	887 return NULL;
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	888 PyErr_Clear();
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	889 classname = inst->in_class->cl_name;
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	890 mod = PyDict_GetItemString(inst->in_class->cl_dict,
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	891 "__module__");
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	892 if (classname != NULL && PyString_Check(classname))
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	893 cname = PyString_AsString(classname);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	894 else
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	895 cname = "?";
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	896 if (mod == NULL \|\| !PyString_Check(mod))
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	897 return PyString_FromFormat("<?.%s instance at %p>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19336 diff changeset	898 cname, inst);
6727 2662c9fe1b3e Change the default repr() and str() of class instance objects to look Guido van Rossum <guido@python.org> parents: 6595 diff changeset	899 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	900 return PyString_FromFormat("<%s.%s instance at %p>",
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	901 PyString_AsString(mod),
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19336 diff changeset	902 cname, inst);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	903 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	904 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	905 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	906 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	907 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	908
17643 56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	909 static PyObject *
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	910 instance_str(PyInstanceObject *inst)
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	911 {
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	912 PyObject *func;
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	913 PyObject *res;
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	914 static PyObject *strstr;
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	915
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	916 if (strstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	917 strstr = PyString_InternFromString("__str__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	918 if (strstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	919 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	920 }
17643 56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	921 func = instance_getattr(inst, strstr);
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	922 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	923 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	924 return NULL;
17643 56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	925 PyErr_Clear();
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	926 return instance_repr(inst);
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	927 }
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	928 res = PyEval_CallObject(func, (PyObject *)NULL);
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	929 Py_DECREF(func);
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	930 return res;
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	931 }
56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	932
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	933 static long
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	934 instance_hash(PyInstanceObject *inst)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	935 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	936 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	937 PyObject *res;
1272 7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	938 long outcome;
16004 9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	939 static PyObject hashstr, eqstr, *cmpstr;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	940
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	941 if (hashstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	942 hashstr = PyString_InternFromString("__hash__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	943 if (hashstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	944 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	945 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	946 func = instance_getattr(inst, hashstr);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	947 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	948 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	949 return -1;
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	950 PyErr_Clear();
16004 9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	951 /* If there is no __eq__ and no __cmp__ method, we hash on the
9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	952 address. If an __eq__ or __cmp__ method exists, there must
9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	953 be a __hash__. */
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	954 if (eqstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	955 eqstr = PyString_InternFromString("__eq__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	956 if (eqstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	957 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	958 }
16004 9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	959 func = instance_getattr(inst, eqstr);
1272 7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	960 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	961 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	962 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	963 PyErr_Clear();
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	964 if (cmpstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	965 cmpstr = PyString_InternFromString("__cmp__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	966 if (cmpstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	967 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	968 }
16004 9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	969 func = instance_getattr(inst, cmpstr);
9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	970 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	971 if (!PyErr_ExceptionMatches(
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	972 PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	973 return -1;
16004 9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	974 PyErr_Clear();
9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	975 return _Py_HashPointer(inst);
9251cf70ed1f Rich comparisons fallout: instance_hash() should check for both Guido van Rossum <guido@python.org> parents: 15972 diff changeset	976 }
1272 7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	977 }
30437 41c2e1723cdd Fix leak in classobject.c. The leak surfaced on the error exit when Raymond Hettinger <python@rcn.com> parents: 28560 diff changeset	978 Py_XDECREF(func);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	979 PyErr_SetString(PyExc_TypeError, "unhashable instance");
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	980 return -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	981 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	982 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	983 Py_DECREF(func);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	984 if (res == NULL)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	985 return -1;
39410 5b9692f6629f __hash__ may now return long int; the final hash Martin v. Löwis <martin@v.loewis.de> parents: 38806 diff changeset	986 if (PyInt_Check(res) \|\| PyLong_Check(res))
5b9692f6629f __hash__ may now return long int; the final hash Martin v. Löwis <martin@v.loewis.de> parents: 38806 diff changeset	987 /* This already converts a -1 result to -2. */
5b9692f6629f __hash__ may now return long int; the final hash Martin v. Löwis <martin@v.loewis.de> parents: 38806 diff changeset	988 outcome = res->ob_type->tp_hash(res);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	989 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	990 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	991 "__hash__() should return an int");
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	992 outcome = -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	993 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	994 Py_DECREF(res);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	995 return outcome;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	996 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	997
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	998 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	999 instance_traverse(PyInstanceObject o, visitproc visit, void arg)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	1000 {
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1001 Py_VISIT(o->in_class);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1002 Py_VISIT(o->in_dict);
12992 3f990ef66667 traverse functions should return 0 on success Jeremy Hylton <jeremy@alum.mit.edu> parents: 12990 diff changeset	1003 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	1004 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	1005
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	1006 static PyObject getitemstr, setitemstr, delitemstr, lenstr;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	1007 static PyObject iterstr, nextstr;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1008
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1009 static Py_ssize_t
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1010 instance_length(PyInstanceObject *inst)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1011 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1012 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1013 PyObject *res;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1014 Py_ssize_t outcome;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1015
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1016 if (lenstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1017 lenstr = PyString_InternFromString("__len__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1018 if (lenstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1019 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1020 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1021 func = instance_getattr(inst, lenstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1022 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1023 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1024 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1025 Py_DECREF(func);
1096 ce718457b172 * classobject.c: in instance_lenth, test result of call_object Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1026 if (res == NULL)
ce718457b172 * classobject.c: in instance_lenth, test result of call_object Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1027 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1028 if (PyInt_Check(res)) {
39464 48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1029 outcome = PyInt_AsSsize_t(res);
48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1030 if (outcome == -1 && PyErr_Occurred()) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1031 Py_DECREF(res);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1032 return -1;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1033 }
39464 48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1034 #if SIZEOF_SIZE_T < SIZEOF_INT
35599 9b994c67e909 A minor fix for 64-bit platforms: when __len__() returns Python int Guido van Rossum <guido@python.org> parents: 35111 diff changeset	1035 /* Overflow check -- range of PyInt is more than C int */
39464 48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1036 if (outcome != (int)outcome) {
35599 9b994c67e909 A minor fix for 64-bit platforms: when __len__() returns Python int Guido van Rossum <guido@python.org> parents: 35111 diff changeset	1037 PyErr_SetString(PyExc_OverflowError,
35610 1f236e598ae9 - On 64-bit platforms, when __len__() returns a value that cannot be Guido van Rossum <guido@python.org> parents: 35599 diff changeset	1038 "__len__() should return 0 <= outcome < 2**31");
35599 9b994c67e909 A minor fix for 64-bit platforms: when __len__() returns Python int Guido van Rossum <guido@python.org> parents: 35111 diff changeset	1039 outcome = -1;
9b994c67e909 A minor fix for 64-bit platforms: when __len__() returns Python int Guido van Rossum <guido@python.org> parents: 35111 diff changeset	1040 }
9b994c67e909 A minor fix for 64-bit platforms: when __len__() returns Python int Guido van Rossum <guido@python.org> parents: 35111 diff changeset	1041 else
9b994c67e909 A minor fix for 64-bit platforms: when __len__() returns Python int Guido van Rossum <guido@python.org> parents: 35111 diff changeset	1042 #endif
39464 48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1043 if (outcome < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1044 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1045 "__len__() should return >= 0");
39464 48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1046 outcome = -1;
48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	1047 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1048 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1049 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1050 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1051 "__len__() should return an int");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1052 outcome = -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1053 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1054 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1055 return outcome;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1056 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1057
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1058 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1059 instance_subscript(PyInstanceObject inst, PyObject key)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1060 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1061 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1062 PyObject *arg;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1063 PyObject *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1064
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1065 if (getitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1066 getitemstr = PyString_InternFromString("__getitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1067 if (getitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1068 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1069 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1070 func = instance_getattr(inst, getitemstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1071 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1072 return NULL;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1073 arg = PyTuple_Pack(1, key);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1074 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1075 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1076 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1077 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1078 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1079 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1080 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1081 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1082 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1083
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1084 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1085 instance_ass_subscript(PyInstanceObject inst, PyObject key, PyObject *value)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1086 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1087 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1088 PyObject *arg;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1089 PyObject *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1090
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1091 if (value == NULL) {
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1092 if (delitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1093 delitemstr = PyString_InternFromString("__delitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1094 if (delitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1095 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1096 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1097 func = instance_getattr(inst, delitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1098 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1099 else {
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1100 if (setitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1101 setitemstr = PyString_InternFromString("__setitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1102 if (setitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1103 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1104 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1105 func = instance_getattr(inst, setitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1106 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1107 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1108 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1109 if (value == NULL)
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1110 arg = PyTuple_Pack(1, key);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1111 else
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1112 arg = PyTuple_Pack(2, key, value);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1113 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1114 Py_DECREF(func);
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	1115 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1116 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1117 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1118 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1119 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1120 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1121 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1122 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1123 return 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1124 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1125
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1126 static PyMappingMethods instance_as_mapping = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1127 (lenfunc)instance_length, /* mp_length */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1128 (binaryfunc)instance_subscript, /* mp_subscript */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1129 (objobjargproc)instance_ass_subscript, /* mp_ass_subscript */
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1130 };
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1131
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1132 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1133 instance_item(PyInstanceObject *inst, Py_ssize_t i)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1134 {
38409 e7af97e278c4 Simplify calling. Georg Brandl <georg@python.org> parents: 38314 diff changeset	1135 PyObject func, res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1136
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1137 if (getitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1138 getitemstr = PyString_InternFromString("__getitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1139 if (getitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1140 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1141 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1142 func = instance_getattr(inst, getitemstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1143 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1144 return NULL;
38409 e7af97e278c4 Simplify calling. Georg Brandl <georg@python.org> parents: 38314 diff changeset	1145 res = PyObject_CallFunction(func, "n", i);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1146 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1147 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1148 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1149
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1150 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1151 instance_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1152 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1153 PyObject func, arg, *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1154 static PyObject *getslicestr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1155
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1156 if (getslicestr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1157 getslicestr = PyString_InternFromString("__getslice__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1158 if (getslicestr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1159 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1160 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1161 func = instance_getattr(inst, getslicestr);
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1162
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1163 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1164 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1165 return NULL;
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1166 PyErr_Clear();
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1167
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1168 if (getitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1169 getitemstr = PyString_InternFromString("__getitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1170 if (getitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1171 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1172 }
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1173 func = instance_getattr(inst, getitemstr);
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1174 if (func == NULL)
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1175 return NULL;
37165 45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 37086 diff changeset	1176 arg = Py_BuildValue("(N)", _PySlice_FromIndices(i, j));
48854 6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1177 }
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1178 else {
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1179 if (PyErr_WarnPy3k("in 3.x, __getslice__ has been removed; "
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1180 "use __getitem__", 1) < 0) {
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1181 Py_DECREF(func);
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1182 return NULL;
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1183 }
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1184 arg = Py_BuildValue("(nn)", i, j);
48854 6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1185 }
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1186
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1187 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1188 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1189 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1190 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1191 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1192 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1193 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1194 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1195 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1196
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1197 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1198 instance_ass_item(PyInstanceObject inst, Py_ssize_t i, PyObject item)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1199 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1200 PyObject func, arg, *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1201
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1202 if (item == NULL) {
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1203 if (delitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1204 delitemstr = PyString_InternFromString("__delitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1205 if (delitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1206 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1207 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1208 func = instance_getattr(inst, delitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1209 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1210 else {
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1211 if (setitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1212 setitemstr = PyString_InternFromString("__setitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1213 if (setitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1214 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1215 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1216 func = instance_getattr(inst, setitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1217 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1218 if (func == NULL)
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	1219 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1220 if (item == NULL)
38485 dcf92dd7408a Correct some value converting strangenesses. Georg Brandl <georg@python.org> parents: 38409 diff changeset	1221 arg = PyInt_FromSsize_t(i);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1222 else
38485 dcf92dd7408a Correct some value converting strangenesses. Georg Brandl <georg@python.org> parents: 38409 diff changeset	1223 arg = Py_BuildValue("(nO)", i, item);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1224 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1225 Py_DECREF(func);
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	1226 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1227 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1228 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1229 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1230 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1231 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1232 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1233 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1234 return 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1235 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1236
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1237 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1238 instance_ass_slice(PyInstanceObject inst, Py_ssize_t i, Py_ssize_t j, PyObject value)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1239 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1240 PyObject func, arg, *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1241 static PyObject setslicestr, delslicestr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1242
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1243 if (value == NULL) {
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1244 if (delslicestr == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1245 delslicestr =
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1246 PyString_InternFromString("__delslice__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1247 if (delslicestr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1248 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1249 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1250 func = instance_getattr(inst, delslicestr);
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1251 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1252 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1253 return -1;
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1254 PyErr_Clear();
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1255 if (delitemstr == NULL) {
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1256 delitemstr =
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1257 PyString_InternFromString("__delitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1258 if (delitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1259 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1260 }
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1261 func = instance_getattr(inst, delitemstr);
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1262 if (func == NULL)
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1263 return -1;
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1264
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1265 arg = Py_BuildValue("(N)",
37165 45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 37086 diff changeset	1266 _PySlice_FromIndices(i, j));
48854 6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1267 }
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1268 else {
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1269 if (PyErr_WarnPy3k("in 3.x, __delslice__ has been "
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1270 "removed; use __delitem__", 1) < 0) {
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1271 Py_DECREF(func);
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1272 return -1;
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1273 }
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1274 arg = Py_BuildValue("(nn)", i, j);
48854 6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1275 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1276 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1277 else {
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1278 if (setslicestr == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1279 setslicestr =
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1280 PyString_InternFromString("__setslice__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1281 if (setslicestr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1282 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1283 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1284 func = instance_getattr(inst, setslicestr);
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1285 if (func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1286 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1287 return -1;
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1288 PyErr_Clear();
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1289 if (setitemstr == NULL) {
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1290 setitemstr =
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1291 PyString_InternFromString("__setitem__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1292 if (setitemstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1293 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1294 }
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1295 func = instance_getattr(inst, setitemstr);
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1296 if (func == NULL)
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1297 return -1;
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1298
91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13678 diff changeset	1299 arg = Py_BuildValue("(NO)",
37165 45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 37086 diff changeset	1300 _PySlice_FromIndices(i, j), value);
48854 6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1301 }
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1302 else {
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1303 if (PyErr_WarnPy3k("in 3.x, __setslice__ has been "
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1304 "removed; use __setitem__", 1) < 0) {
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1305 Py_DECREF(func);
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1306 return -1;
6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1307 }
36558 d3685f9b7b71 Remove size constraints in SLICE opcodes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1308 arg = Py_BuildValue("(nnO)", i, j, value);
48854 6ea1a720b057 generate py3k warnings on __getslice__, __delslice__, and __setslice__ Benjamin Peterson <benjamin@python.org> parents: 47527 diff changeset	1309 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1310 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1311 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1312 Py_DECREF(func);
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	1313 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1314 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1315 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1316 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1317 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1318 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1319 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1320 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1321 return 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1322 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1323
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1324 static int
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1325 instance_contains(PyInstanceObject inst, PyObject member)
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1326 {
32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1327 static PyObject *__contains__;
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1328 PyObject *func;
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1329
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1330 /* Try __contains__ first.
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1331 * If that can't be done, try iterator-based searching.
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1332 */
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1333
32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1334 if(__contains__ == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1335 __contains__ = PyString_InternFromString("__contains__");
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1336 if(__contains__ == NULL)
32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1337 return -1;
32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1338 }
32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1339 func = instance_getattr(inst, __contains__);
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1340 if (func) {
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1341 PyObject *res;
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1342 int ret;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1343 PyObject *arg = PyTuple_Pack(1, member);
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1344 if(arg == NULL) {
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1345 Py_DECREF(func);
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1346 return -1;
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1347 }
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1348 res = PyEval_CallObject(func, arg);
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1349 Py_DECREF(func);
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1350 Py_DECREF(arg);
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1351 if(res == NULL)
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1352 return -1;
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1353 ret = PyObject_IsTrue(res);
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1354 Py_DECREF(res);
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1355 return ret;
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1356 }
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1357
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1358 /* Couldn't find __contains__. */
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1359 if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
40301 61cd8c87cfe2 Correctly forward exception in instance_contains(). Martin v. Löwis <martin@v.loewis.de> parents: 39921 diff changeset	1360 Py_ssize_t rc;
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1361 /* Assume the failure was simply due to that there is no
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1362 * __contains__ attribute, and try iterating instead.
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1363 */
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17669 diff changeset	1364 PyErr_Clear();
40301 61cd8c87cfe2 Correctly forward exception in instance_contains(). Martin v. Löwis <martin@v.loewis.de> parents: 39921 diff changeset	1365 rc = _PySequence_IterSearch((PyObject *)inst, member,
61cd8c87cfe2 Correctly forward exception in instance_contains(). Martin v. Löwis <martin@v.loewis.de> parents: 39921 diff changeset	1366 PY_ITERSEARCH_CONTAINS);
61cd8c87cfe2 Correctly forward exception in instance_contains(). Martin v. Löwis <martin@v.loewis.de> parents: 39921 diff changeset	1367 if (rc >= 0)
61cd8c87cfe2 Correctly forward exception in instance_contains(). Martin v. Löwis <martin@v.loewis.de> parents: 39921 diff changeset	1368 return rc > 0;
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1369 }
40301 61cd8c87cfe2 Correctly forward exception in instance_contains(). Martin v. Löwis <martin@v.loewis.de> parents: 39921 diff changeset	1370 return -1;
11869 32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1371 }
32c59e2889c4 Patch by Mozhe Zadka, for __contains__ (overloading 'in'). This adds Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1372
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1373 static PySequenceMethods
0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1374 instance_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1375 (lenfunc)instance_length, /* sq_length */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1376 0, /* sq_concat */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1377 0, /* sq_repeat */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1378 (ssizeargfunc)instance_item, /* sq_item */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1379 (ssizessizeargfunc)instance_slice, /* sq_slice */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1380 (ssizeobjargproc)instance_ass_item, /* sq_ass_item */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1381 (ssizessizeobjargproc)instance_ass_slice,/* sq_ass_slice */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1382 (objobjproc)instance_contains, /* sq_contains */
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1383 };
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1384
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1385 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1386 generic_unary_op(PyInstanceObject self, PyObject methodname)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1387 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1388 PyObject func, res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1389
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1390 if ((func = instance_getattr(self, methodname)) == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1391 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1392 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1393 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1394 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1395 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1396
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1397 static PyObject *
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1398 generic_binary_op(PyObject v, PyObject w, char *opname)
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1399 {
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1400 PyObject *result;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1401 PyObject *args;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1402 PyObject *func = PyObject_GetAttrString(v, opname);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1403 if (func == NULL) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1404 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1405 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1406 PyErr_Clear();
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1407 Py_INCREF(Py_NotImplemented);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1408 return Py_NotImplemented;
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	1409 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1410 args = PyTuple_Pack(1, w);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1411 if (args == NULL) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1412 Py_DECREF(func);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1413 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1414 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1415 result = PyEval_CallObject(func, args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1416 Py_DECREF(args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1417 Py_DECREF(func);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1418 return result;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1419 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1420
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1421
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1422 static PyObject *coerce_obj;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1423
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1424 /* Try one half of a binary operator involving a class instance. */
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1425 static PyObject *
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1426 half_binop(PyObject v, PyObject w, char *opname, binaryfunc thisfunc,
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1427 int swapped)
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1428 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1429 PyObject *args;
6595 5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1430 PyObject *coercefunc;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1431 PyObject *coerced = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1432 PyObject *v1;
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1433 PyObject *result;
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1434
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1435 if (!PyInstance_Check(v)) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1436 Py_INCREF(Py_NotImplemented);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1437 return Py_NotImplemented;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1438 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1439
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1440 if (coerce_obj == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1441 coerce_obj = PyString_InternFromString("__coerce__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1442 if (coerce_obj == NULL)
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1443 return NULL;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1444 }
6595 5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1445 coercefunc = PyObject_GetAttr(v, coerce_obj);
5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1446 if (coercefunc == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1447 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1448 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1449 PyErr_Clear();
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1450 return generic_binary_op(v, w, opname);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1451 }
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1452
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1453 args = PyTuple_Pack(1, w);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1454 if (args == NULL) {
25842 eab7940277fb Fix (real! :-) memory leaks in half_cmp and half_binop. Guido van Rossum <guido@python.org> parents: 24910 diff changeset	1455 Py_DECREF(coercefunc);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1456 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1457 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1458 coerced = PyEval_CallObject(coercefunc, args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1459 Py_DECREF(args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1460 Py_DECREF(coercefunc);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1461 if (coerced == NULL) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1462 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1463 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1464 if (coerced == Py_None \|\| coerced == Py_NotImplemented) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1465 Py_DECREF(coerced);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1466 return generic_binary_op(v, w, opname);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1467 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1468 if (!PyTuple_Check(coerced) \|\| PyTuple_Size(coerced) != 2) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1469 Py_DECREF(coerced);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1470 PyErr_SetString(PyExc_TypeError,
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1471 "coercion should return None or 2-tuple");
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1472 return NULL;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1473 }
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1474 v1 = PyTuple_GetItem(coerced, 0);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1475 w = PyTuple_GetItem(coerced, 1);
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1476 if (v1->ob_type == v->ob_type && PyInstance_Check(v)) {
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1477 /* prevent recursion if __coerce__ returns self as the first
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1478 * argument */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1479 result = generic_binary_op(v1, w, opname);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1480 } else {
38806 74bf573bff4c If a classic class defined a __coerce__() method that just returned its two Brett Cannon <bcannon@gmail.com> parents: 38659 diff changeset	1481 if (Py_EnterRecursiveCall(" after coercion"))
74bf573bff4c If a classic class defined a __coerce__() method that just returned its two Brett Cannon <bcannon@gmail.com> parents: 38659 diff changeset	1482 return NULL;
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1483 if (swapped)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1484 result = (thisfunc)(w, v1);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1485 else
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1486 result = (thisfunc)(v1, w);
38806 74bf573bff4c If a classic class defined a __coerce__() method that just returned its two Brett Cannon <bcannon@gmail.com> parents: 38659 diff changeset	1487 Py_LeaveRecursiveCall();
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1488 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1489 Py_DECREF(coerced);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1490 return result;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1491 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1492
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1493 /* Implement a binary operator involving at least one class instance. */
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1494 static PyObject *
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1495 do_binop(PyObject v, PyObject w, char opname, char ropname,
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1496 binaryfunc thisfunc)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1497 {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1498 PyObject *result = half_binop(v, w, opname, thisfunc, 0);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1499 if (result == Py_NotImplemented) {
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1500 Py_DECREF(result);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1501 result = half_binop(w, v, ropname, thisfunc, 1);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1502 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1503 return result;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1504 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1505
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1506 static PyObject *
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1507 do_binop_inplace(PyObject v, PyObject w, char iopname, char opname,
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1508 char *ropname, binaryfunc thisfunc)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1509 {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1510 PyObject *result = half_binop(v, w, iopname, thisfunc, 0);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1511 if (result == Py_NotImplemented) {
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1512 Py_DECREF(result);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1513 result = do_binop(v, w, opname, ropname, thisfunc);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1514 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1515 return result;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1516 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1517
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1518 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1519 instance_coerce(PyObject pv, PyObject pw)
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1520 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1521 PyObject v = pv;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1522 PyObject w = pw;
6595 5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1523 PyObject *coercefunc;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1524 PyObject *args;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1525 PyObject *coerced;
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1526
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1527 if (coerce_obj == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1528 coerce_obj = PyString_InternFromString("__coerce__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1529 if (coerce_obj == NULL)
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1530 return -1;
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1531 }
6595 5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1532 coercefunc = PyObject_GetAttr(v, coerce_obj);
5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1533 if (coercefunc == NULL) {
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1534 /* No __coerce__ method */
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1535 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1536 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1537 PyErr_Clear();
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1538 return 1;
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1539 }
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1540 /* Has __coerce__ method: call it */
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1541 args = PyTuple_Pack(1, w);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1542 if (args == NULL) {
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1543 return -1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1544 }
6595 5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1545 coerced = PyEval_CallObject(coercefunc, args);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1546 Py_DECREF(args);
6595 5e0b152bf1e6 Undo another glitch of the automatic not-so-Grand Renaming; some local Guido van Rossum <guido@python.org> parents: 6502 diff changeset	1547 Py_DECREF(coercefunc);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1548 if (coerced == NULL) {
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1549 /* __coerce__ call raised an exception */
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1550 return -1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1551 }
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1552 if (coerced == Py_None \|\| coerced == Py_NotImplemented) {
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1553 /* __coerce__ says "I can't do it" */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1554 Py_DECREF(coerced);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1555 return 1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1556 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1557 if (!PyTuple_Check(coerced) \|\| PyTuple_Size(coerced) != 2) {
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1558 /* __coerce__ return value is malformed */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1559 Py_DECREF(coerced);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1560 PyErr_SetString(PyExc_TypeError,
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1561 "coercion should return None or 2-tuple");
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1562 return -1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1563 }
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1564 /* __coerce__ returned two new values */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1565 *pv = PyTuple_GetItem(coerced, 0);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1566 *pw = PyTuple_GetItem(coerced, 1);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1567 Py_INCREF(*pv);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1568 Py_INCREF(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1569 Py_DECREF(coerced);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1570 return 0;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1571 }
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1572
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1573 #define UNARY(funcname, methodname) \
13678 3177e2829167 ANSIfy functions that were hiding inside a macro. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1574 static PyObject funcname(PyInstanceObject self) { \
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1575 static PyObject *o; \
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1576 if (o == NULL) { o = PyString_InternFromString(methodname); \
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1577 if (o == NULL) return NULL; } \
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1578 return generic_unary_op(self, o); \
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1579 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1580
41634 54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1581 /* unary function with a fallback */
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1582 #define UNARY_FB(funcname, methodname, funcname_fb) \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1583 static PyObject funcname(PyInstanceObject self) { \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1584 static PyObject *o; \
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1585 if (o == NULL) { o = PyString_InternFromString(methodname); \
41634 54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1586 if (o == NULL) return NULL; } \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1587 if (PyObject_HasAttr((PyObject*)self, o)) \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1588 return generic_unary_op(self, o); \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1589 else \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1590 return funcname_fb(self); \
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1591 }
54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1592
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1593 #define BINARY(f, m, n) \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1594 static PyObject f(PyObject v, PyObject *w) { \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1595 return do_binop(v, w, "__" m "__", "__r" m "__", n); \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1596 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1597
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1598 #define BINARY_INPLACE(f, m, n) \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1599 static PyObject f(PyObject v, PyObject *w) { \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1600 return do_binop_inplace(v, w, "__i" m "__", "__" m "__", \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1601 "__r" m "__", n); \
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1602 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1603
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1604 UNARY(instance_neg, "__neg__")
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1605 UNARY(instance_pos, "__pos__")
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1606 UNARY(instance_abs, "__abs__")
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1607
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1608 BINARY(instance_or, "or", PyNumber_Or)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1609 BINARY(instance_and, "and", PyNumber_And)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1610 BINARY(instance_xor, "xor", PyNumber_Xor)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1611 BINARY(instance_lshift, "lshift", PyNumber_Lshift)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1612 BINARY(instance_rshift, "rshift", PyNumber_Rshift)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1613 BINARY(instance_add, "add", PyNumber_Add)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1614 BINARY(instance_sub, "sub", PyNumber_Subtract)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1615 BINARY(instance_mul, "mul", PyNumber_Multiply)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1616 BINARY(instance_div, "div", PyNumber_Divide)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1617 BINARY(instance_mod, "mod", PyNumber_Remainder)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1618 BINARY(instance_divmod, "divmod", PyNumber_Divmod)
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18934 diff changeset	1619 BINARY(instance_floordiv, "floordiv", PyNumber_FloorDivide)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18934 diff changeset	1620 BINARY(instance_truediv, "truediv", PyNumber_TrueDivide)
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1621
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1622 BINARY_INPLACE(instance_ior, "or", PyNumber_InPlaceOr)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1623 BINARY_INPLACE(instance_ixor, "xor", PyNumber_InPlaceXor)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1624 BINARY_INPLACE(instance_iand, "and", PyNumber_InPlaceAnd)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1625 BINARY_INPLACE(instance_ilshift, "lshift", PyNumber_InPlaceLshift)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1626 BINARY_INPLACE(instance_irshift, "rshift", PyNumber_InPlaceRshift)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1627 BINARY_INPLACE(instance_iadd, "add", PyNumber_InPlaceAdd)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1628 BINARY_INPLACE(instance_isub, "sub", PyNumber_InPlaceSubtract)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1629 BINARY_INPLACE(instance_imul, "mul", PyNumber_InPlaceMultiply)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1630 BINARY_INPLACE(instance_idiv, "div", PyNumber_InPlaceDivide)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1631 BINARY_INPLACE(instance_imod, "mod", PyNumber_InPlaceRemainder)
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18934 diff changeset	1632 BINARY_INPLACE(instance_ifloordiv, "floordiv", PyNumber_InPlaceFloorDivide)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18934 diff changeset	1633 BINARY_INPLACE(instance_itruediv, "truediv", PyNumber_InPlaceTrueDivide)
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1634
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1635 /* Try a 3-way comparison, returning an int; v is an instance. Return:
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1636 -2 for an exception;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1637 -1 if v < w;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1638 0 if v == w;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1639 1 if v > w;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1640 2 if this particular 3-way comparison is not implemented or undefined.
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1641 */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1642 static int
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1643 half_cmp(PyObject v, PyObject w)
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1644 {
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1645 static PyObject *cmp_obj;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1646 PyObject *args;
16356 4ff2858d7a85 Rename dubiously named local variable 'cmpfunc' -- this is also a Guido van Rossum <guido@python.org> parents: 16352 diff changeset	1647 PyObject *cmp_func;
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1648 PyObject *result;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1649 long l;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1650
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1651 assert(PyInstance_Check(v));
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1652
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1653 if (cmp_obj == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1654 cmp_obj = PyString_InternFromString("__cmp__");
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1655 if (cmp_obj == NULL)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1656 return -2;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1657 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1658
16356 4ff2858d7a85 Rename dubiously named local variable 'cmpfunc' -- this is also a Guido van Rossum <guido@python.org> parents: 16352 diff changeset	1659 cmp_func = PyObject_GetAttr(v, cmp_obj);
4ff2858d7a85 Rename dubiously named local variable 'cmpfunc' -- this is also a Guido van Rossum <guido@python.org> parents: 16352 diff changeset	1660 if (cmp_func == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1661 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1662 return -2;
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1663 PyErr_Clear();
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1664 return 2;
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1665 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1666
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1667 args = PyTuple_Pack(1, w);
25842 eab7940277fb Fix (real! :-) memory leaks in half_cmp and half_binop. Guido van Rossum <guido@python.org> parents: 24910 diff changeset	1668 if (args == NULL) {
eab7940277fb Fix (real! :-) memory leaks in half_cmp and half_binop. Guido van Rossum <guido@python.org> parents: 24910 diff changeset	1669 Py_DECREF(cmp_func);
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1670 return -2;
25842 eab7940277fb Fix (real! :-) memory leaks in half_cmp and half_binop. Guido van Rossum <guido@python.org> parents: 24910 diff changeset	1671 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1672
16356 4ff2858d7a85 Rename dubiously named local variable 'cmpfunc' -- this is also a Guido van Rossum <guido@python.org> parents: 16352 diff changeset	1673 result = PyEval_CallObject(cmp_func, args);
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1674 Py_DECREF(args);
16356 4ff2858d7a85 Rename dubiously named local variable 'cmpfunc' -- this is also a Guido van Rossum <guido@python.org> parents: 16352 diff changeset	1675 Py_DECREF(cmp_func);
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1676
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1677 if (result == NULL)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1678 return -2;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1679
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1680 if (result == Py_NotImplemented) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1681 Py_DECREF(result);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1682 return 2;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1683 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1684
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1685 l = PyInt_AsLong(result);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1686 Py_DECREF(result);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1687 if (l == -1 && PyErr_Occurred()) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1688 PyErr_SetString(PyExc_TypeError,
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1689 "comparison did not return an int");
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1690 return -2;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1691 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1692
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1693 return l < 0 ? -1 : l > 0 ? 1 : 0;
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1694 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1695
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1696 /* Try a 3-way comparison, returning an int; either v or w is an instance.
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1697 We first try a coercion. Return:
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1698 -2 for an exception;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1699 -1 if v < w;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1700 0 if v == w;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1701 1 if v > w;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1702 2 if this particular 3-way comparison is not implemented or undefined.
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1703 THIS IS ONLY CALLED FROM object.c!
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1704 */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1705 static int
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1706 instance_compare(PyObject v, PyObject w)
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1707 {
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1708 int c;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1709
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1710 c = PyNumber_CoerceEx(&v, &w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1711 if (c < 0)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1712 return -2;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1713 if (c == 0) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1714 /* If neither is now an instance, use regular comparison */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1715 if (!PyInstance_Check(v) && !PyInstance_Check(w)) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1716 c = PyObject_Compare(v, w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1717 Py_DECREF(v);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1718 Py_DECREF(w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1719 if (PyErr_Occurred())
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1720 return -2;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1721 return c < 0 ? -1 : c > 0 ? 1 : 0;
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1722 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1723 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1724 else {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1725 /* The coercion didn't do anything.
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1726 Treat this the same as returning v and w unchanged. */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1727 Py_INCREF(v);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1728 Py_INCREF(w);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1729 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1730
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1731 if (PyInstance_Check(v)) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1732 c = half_cmp(v, w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1733 if (c <= 1) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1734 Py_DECREF(v);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1735 Py_DECREF(w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1736 return c;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1737 }
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1738 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1739 if (PyInstance_Check(w)) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1740 c = half_cmp(w, v);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1741 if (c <= 1) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1742 Py_DECREF(v);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1743 Py_DECREF(w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1744 if (c >= -1)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1745 c = -c;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1746 return c;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1747 }
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1748 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1749 Py_DECREF(v);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1750 Py_DECREF(w);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1751 return 2;
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1752 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1753
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1754 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1755 instance_nonzero(PyInstanceObject *self)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1756 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1757 PyObject func, res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1758 long outcome;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1759 static PyObject *nonzerostr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1760
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1761 if (nonzerostr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1762 nonzerostr = PyString_InternFromString("__nonzero__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1763 if (nonzerostr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1764 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1765 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1766 if ((func = instance_getattr(self, nonzerostr)) == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1767 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1768 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1769 PyErr_Clear();
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1770 if (lenstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1771 lenstr = PyString_InternFromString("__len__");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1772 if (lenstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1773 return -1;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	1774 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1775 if ((func = instance_getattr(self, lenstr)) == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1776 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	1777 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1778 PyErr_Clear();
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1779 /* Fall back to the default behavior:
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1780 all instances are nonzero */
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1781 return 1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1782 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1783 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1784 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1785 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1786 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1787 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1788 if (!PyInt_Check(res)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1789 Py_DECREF(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1790 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1791 "__nonzero__ should return an int");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1792 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1793 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1794 outcome = PyInt_AsLong(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1795 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1796 if (outcome < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1797 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1798 "__nonzero__ should return >= 0");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1799 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1800 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1801 return outcome > 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1802 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1803
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39410 diff changeset	1804 static PyObject *
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1805 instance_index(PyInstanceObject *self)
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1806 {
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1807 PyObject func, res;
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1808 static PyObject *indexstr = NULL;
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1809
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1810 if (indexstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1811 indexstr = PyString_InternFromString("__index__");
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1812 if (indexstr == NULL)
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39410 diff changeset	1813 return NULL;
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1814 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1815 if ((func = instance_getattr(self, indexstr)) == NULL) {
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1816 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39410 diff changeset	1817 return NULL;
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1818 PyErr_Clear();
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1819 PyErr_SetString(PyExc_TypeError,
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1820 "object cannot be interpreted as an index");
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39410 diff changeset	1821 return NULL;
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1822 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1823 res = PyEval_CallObject(func, (PyObject *)NULL);
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1824 Py_DECREF(func);
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39410 diff changeset	1825 return res;
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1826 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1827
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	1828
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1829 UNARY(instance_invert, "__invert__")
45142 f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1830 UNARY(_instance_trunc, "__trunc__")
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1831
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1832 static PyObject *
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1833 instance_int(PyInstanceObject *self)
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1834 {
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1835 PyObject *truncated;
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1836 static PyObject *int_name;
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1837 if (int_name == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1838 int_name = PyString_InternFromString("__int__");
45142 f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1839 if (int_name == NULL)
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1840 return NULL;
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1841 }
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1842 if (PyObject_HasAttr((PyObject*)self, int_name))
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1843 return generic_unary_op(self, int_name);
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1844
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1845 truncated = _instance_trunc(self);
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1846 /* __trunc__ is specified to return an Integral type, but
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1847 int() needs to return an int. */
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1848 return _PyNumber_ConvertIntegralToInt(
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1849 truncated,
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1850 "__trunc__ returned non-Integral (type %.200s)");
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1851 }
f03955faffb4 Make int() and long() fall back to __trunc__(). See issue 2002. Jeffrey Yasskin <jyasskin@gmail.com> parents: 44751 diff changeset	1852
41634 54179538a387 As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 40301 diff changeset	1853 UNARY_FB(instance_long, "__long__", instance_int)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1854 UNARY(instance_float, "__float__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1855 UNARY(instance_oct, "__oct__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1856 UNARY(instance_hex, "__hex__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1857
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1858 static PyObject *
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1859 bin_power(PyObject v, PyObject w)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1860 {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1861 return PyNumber_Power(v, w, Py_None);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1862 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1863
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1864 /* This version is for ternary calls only (z != None) */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1865 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1866 instance_pow(PyObject v, PyObject w, PyObject *z)
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1867 {
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1868 if (z == Py_None) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1869 return do_binop(v, w, "__pow__", "__rpow__", bin_power);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1870 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1871 else {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1872 PyObject *func;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1873 PyObject *args;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1874 PyObject *result;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1875
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1876 /* XXX Doesn't do coercions... */
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1877 func = PyObject_GetAttrString(v, "__pow__");
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1878 if (func == NULL)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1879 return NULL;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1880 args = PyTuple_Pack(2, w, z);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1881 if (args == NULL) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1882 Py_DECREF(func);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1883 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1884 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1885 result = PyEval_CallObject(func, args);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1886 Py_DECREF(func);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1887 Py_DECREF(args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1888 return result;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1889 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1890 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1891
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14049 diff changeset	1892 static PyObject *
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1893 bin_inplace_power(PyObject v, PyObject w)
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14049 diff changeset	1894 {
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1895 return PyNumber_InPlacePower(v, w, Py_None);
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14049 diff changeset	1896 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14049 diff changeset	1897
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14049 diff changeset	1898
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1899 static PyObject *
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1900 instance_ipow(PyObject v, PyObject w, PyObject *z)
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1901 {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1902 if (z == Py_None) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1903 return do_binop_inplace(v, w, "__ipow__", "__pow__",
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1904 "__rpow__", bin_inplace_power);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1905 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1906 else {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1907 /* XXX Doesn't do coercions... */
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1908 PyObject *func;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1909 PyObject *args;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1910 PyObject *result;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1911
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1912 func = PyObject_GetAttrString(v, "__ipow__");
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1913 if (func == NULL) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1914 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1915 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1916 PyErr_Clear();
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1917 return instance_pow(v, w, z);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1918 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1919 args = PyTuple_Pack(2, w, z);
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1920 if (args == NULL) {
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1921 Py_DECREF(func);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1922 return NULL;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1923 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1924 result = PyEval_CallObject(func, args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1925 Py_DECREF(func);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1926 Py_DECREF(args);
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1927 return result;
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1928 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1929 }
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1930
3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1931
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1932 /* Map rich comparison operators to their __xx__ namesakes */
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1933 #define NAME_OPS 6
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1934 static PyObject **name_op = NULL;
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1935
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1936 static int
17894 14da5314664d init_name_op(): add (void) to the argument list to make it a valid Guido van Rossum <guido@python.org> parents: 17783 diff changeset	1937 init_name_op(void)
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1938 {
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1939 int i;
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1940 char *_name_op[] = {
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1941 "__lt__",
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1942 "__le__",
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1943 "__eq__",
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1944 "__ne__",
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1945 "__gt__",
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1946 "__ge__",
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1947 };
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1948
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1949 name_op = (PyObject *)malloc(sizeof(PyObject ) * NAME_OPS);
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1950 if (name_op == NULL)
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1951 return -1;
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1952 for (i = 0; i < NAME_OPS; ++i) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1953 name_op[i] = PyString_InternFromString(_name_op[i]);
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1954 if (name_op[i] == NULL)
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1955 return -1;
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1956 }
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1957 return 0;
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1958 }
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1959
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1960 static PyObject *
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1961 half_richcompare(PyObject v, PyObject w, int op)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1962 {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1963 PyObject *method;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1964 PyObject *args;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1965 PyObject *res;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1966
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1967 assert(PyInstance_Check(v));
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1968
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1969 if (name_op == NULL) {
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1970 if (init_name_op() < 0)
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1971 return NULL;
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1972 }
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1973 /* If the instance doesn't define an __getattr__ method, use
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1974 instance_getattr2 directly because it will not set an
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1975 exception on failure. */
25941 7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1976 if (((PyInstanceObject *)v)->in_class->cl_getattr == NULL)
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1977 method = instance_getattr2((PyInstanceObject *)v,
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1978 name_op[op]);
25941 7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1979 else
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1980 method = PyObject_GetAttr(v, name_op[op]);
25941 7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1981 if (method == NULL) {
7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1982 if (PyErr_Occurred()) {
17783 1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1983 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1984 return NULL;
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1985 PyErr_Clear();
1dacd0d60637 Variant of SF patch 423181 Jeremy Hylton <jeremy@alum.mit.edu> parents: 17692 diff changeset	1986 }
25941 7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1987 res = Py_NotImplemented;
7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1988 Py_INCREF(res);
7b773a1271c3 Since properties are supported here, is possible that Guido van Rossum <guido@python.org> parents: 25842 diff changeset	1989 return res;
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1990 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1991
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30437 diff changeset	1992 args = PyTuple_Pack(1, w);
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1993 if (args == NULL) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1994 Py_DECREF(method);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1995 return NULL;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1996 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1997
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1998 res = PyEval_CallObject(method, args);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	1999 Py_DECREF(args);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2000 Py_DECREF(method);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2001
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2002 return res;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2003 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2004
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2005 static PyObject *
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2006 instance_richcompare(PyObject v, PyObject w, int op)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2007 {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2008 PyObject *res;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2009
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2010 if (PyInstance_Check(v)) {
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2011 res = half_richcompare(v, w, op);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2012 if (res != Py_NotImplemented)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2013 return res;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2014 Py_DECREF(res);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2015 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2016
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2017 if (PyInstance_Check(w)) {
33541 781aef974463 A static swapped_op[] array was defined in 3 different C files, & I think Tim Peters <tim.peters@gmail.com> parents: 32916 diff changeset	2018 res = half_richcompare(w, v, _Py_SwappedOp[op]);
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2019 if (res != Py_NotImplemented)
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2020 return res;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2021 Py_DECREF(res);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2022 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2023
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2024 Py_INCREF(Py_NotImplemented);
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2025 return Py_NotImplemented;
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2026 }
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2027
15722 3e862a51861f Make instances a new style number type. See PEP 208 for details. Instance Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2028
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2029 /* Get the iterator */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2030 static PyObject *
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2031 instance_getiter(PyInstanceObject *self)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2032 {
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2033 PyObject *func;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2034
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2035 if (iterstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2036 iterstr = PyString_InternFromString("__iter__");
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2037 if (iterstr == NULL)
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2038 return NULL;
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2039 }
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2040 if (getitemstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2041 getitemstr = PyString_InternFromString("__getitem__");
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2042 if (getitemstr == NULL)
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2043 return NULL;
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2044 }
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2045
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2046 if ((func = instance_getattr(self, iterstr)) != NULL) {
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2047 PyObject res = PyEval_CallObject(func, (PyObject )NULL);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2048 Py_DECREF(func);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2049 if (res != NULL && !PyIter_Check(res)) {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2050 PyErr_Format(PyExc_TypeError,
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2051 "__iter__ returned non-iterator "
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2052 "of type '%.100s'",
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2053 res->ob_type->tp_name);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2054 Py_DECREF(res);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2055 res = NULL;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2056 }
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2057 return res;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2058 }
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2059 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2060 return NULL;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2061 PyErr_Clear();
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2062 if ((func = instance_getattr(self, getitemstr)) == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2063 PyErr_SetString(PyExc_TypeError,
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2064 "iteration over non-sequence");
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2065 return NULL;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2066 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2067 Py_DECREF(func);
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2068 return PySeqIter_New((PyObject *)self);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2069 }
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2070
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2071
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2072 /* Call the iterator's next */
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2073 static PyObject *
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2074 instance_iternext(PyInstanceObject *self)
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2075 {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2076 PyObject *func;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2077
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	2078 if (nextstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2079 nextstr = PyString_InternFromString("next");
39467 3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	2080 if (nextstr == NULL)
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	2081 return NULL;
3be6627323b9 Handle a whole lot of failures from PyString_FromInternedString(). Neal Norwitz <nnorwitz@gmail.com> parents: 39464 diff changeset	2082 }
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2083
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2084 if ((func = instance_getattr(self, nextstr)) != NULL) {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2085 PyObject res = PyEval_CallObject(func, (PyObject )NULL);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2086 Py_DECREF(func);
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2087 if (res != NULL) {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2088 return res;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2089 }
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2090 if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2091 PyErr_Clear();
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2092 return NULL;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2093 }
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2094 return NULL;
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2095 }
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2096 PyErr_SetString(PyExc_TypeError, "instance has no next() method");
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2097 return NULL;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2098 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2099
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2100 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2101 instance_call(PyObject func, PyObject arg, PyObject *kw)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2102 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2103 PyObject res, call = PyObject_GetAttrString(func, "__call__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2104 if (call == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2105 PyInstanceObject inst = (PyInstanceObject) func;
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2106 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2107 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2108 PyErr_Clear();
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2109 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2110 "%.200s instance has no __call__ method",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2111 PyString_AsString(inst->in_class->cl_name));
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2112 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2113 }
23839 c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2114 /* We must check and increment the recursion depth here. Scenario:
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2115 class A:
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2116 pass
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2117 A.__call__ = A() # that's right
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2118 a = A() # ok
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2119 a() # infinite recursion
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2120 This bounces between instance_call() and PyObject_Call() without
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2121 ever hitting eval_frame() (which has the main recursion check). */
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30683 diff changeset	2122 if (Py_EnterRecursiveCall(" in __call__")) {
23839 c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2123 res = NULL;
c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2124 }
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30683 diff changeset	2125 else {
23839 c8815bd01ff5 Fix for SF bug 532646. This is a little simpler than what Neal Guido van Rossum <guido@python.org> parents: 20698 diff changeset	2126 res = PyObject_Call(call, arg, kw);
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30683 diff changeset	2127 Py_LeaveRecursiveCall();
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30683 diff changeset	2128 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2129 Py_DECREF(call);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2130 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2131 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2132
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2133
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2134 static PyNumberMethods instance_as_number = {
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2135 instance_add, /* nb_add */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2136 instance_sub, /* nb_subtract */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2137 instance_mul, /* nb_multiply */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2138 instance_div, /* nb_divide */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2139 instance_mod, /* nb_remainder */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2140 instance_divmod, /* nb_divmod */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2141 instance_pow, /* nb_power */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2142 (unaryfunc)instance_neg, /* nb_negative */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2143 (unaryfunc)instance_pos, /* nb_positive */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2144 (unaryfunc)instance_abs, /* nb_absolute */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2145 (inquiry)instance_nonzero, /* nb_nonzero */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2146 (unaryfunc)instance_invert, /* nb_invert */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2147 instance_lshift, /* nb_lshift */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2148 instance_rshift, /* nb_rshift */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2149 instance_and, /* nb_and */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2150 instance_xor, /* nb_xor */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2151 instance_or, /* nb_or */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2152 instance_coerce, /* nb_coerce */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2153 (unaryfunc)instance_int, /* nb_int */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2154 (unaryfunc)instance_long, /* nb_long */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2155 (unaryfunc)instance_float, /* nb_float */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2156 (unaryfunc)instance_oct, /* nb_oct */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2157 (unaryfunc)instance_hex, /* nb_hex */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2158 instance_iadd, /* nb_inplace_add */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2159 instance_isub, /* nb_inplace_subtract */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2160 instance_imul, /* nb_inplace_multiply */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2161 instance_idiv, /* nb_inplace_divide */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2162 instance_imod, /* nb_inplace_remainder */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2163 instance_ipow, /* nb_inplace_power */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2164 instance_ilshift, /* nb_inplace_lshift */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2165 instance_irshift, /* nb_inplace_rshift */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2166 instance_iand, /* nb_inplace_and */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2167 instance_ixor, /* nb_inplace_xor */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2168 instance_ior, /* nb_inplace_or */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2169 instance_floordiv, /* nb_floor_divide */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2170 instance_truediv, /* nb_true_divide */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2171 instance_ifloordiv, /* nb_inplace_floor_divide */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2172 instance_itruediv, /* nb_inplace_true_divide */
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39410 diff changeset	2173 (unaryfunc)instance_index, /* nb_index */
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	2174 };
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	2175
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2176 PyTypeObject PyInstance_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2177 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2178 0,
174 20fee4e2eecd Change ugly 'class member' to more normal 'instance'. Guido van Rossum <guido@python.org> parents: 145 diff changeset	2179 "instance",
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2180 sizeof(PyInstanceObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2181 0,
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2182 (destructor)instance_dealloc, /* tp_dealloc */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2183 0, /* tp_print */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2184 0, /* tp_getattr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2185 0, /* tp_setattr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2186 instance_compare, /* tp_compare */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2187 (reprfunc)instance_repr, /* tp_repr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2188 &instance_as_number, /* tp_as_number */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2189 &instance_as_sequence, /* tp_as_sequence */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2190 &instance_as_mapping, /* tp_as_mapping */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2191 (hashfunc)instance_hash, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2192 instance_call, /* tp_call */
17643 56c5445ec835 Well darnit! The innocuous fix I made to PyObject_Print() caused Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2193 (reprfunc)instance_str, /* tp_str */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2194 (getattrofunc)instance_getattr, /* tp_getattro */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2195 (setattrofunc)instance_setattr, /* tp_setattro */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2196 0, /* tp_as_buffer */
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2197 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \| Py_TPFLAGS_CHECKTYPES,/tp_flags/
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2198 instance_doc, /* tp_doc */
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2199 (traverseproc)instance_traverse, /* tp_traverse */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2200 0, /* tp_clear */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2201 instance_richcompare, /* tp_richcompare */
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2202 offsetof(PyInstanceObject, in_weakreflist), /* tp_weaklistoffset */
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17170 diff changeset	2203 (getiterfunc)instance_getiter, /* tp_iter */
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2204 (iternextfunc)instance_iternext, /* tp_iternext */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2205 0, /* tp_methods */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2206 0, /* tp_members */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2207 0, /* tp_getset */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2208 0, /* tp_base */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2209 0, /* tp_dict */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2210 0, /* tp_descr_get */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2211 0, /* tp_descr_set */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2212 0, /* tp_dictoffset */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2213 0, /* tp_init */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2214 0, /* tp_alloc */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2215 instance_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2216 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2217
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2218
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2219 /* Instance method objects are used for two purposes:
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2220 (a) as bound instance methods (returned by instancename.methodname)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2221 (b) as unbound methods (returned by ClassName.methodname)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2222 In case (b), im_self is NULL
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2223 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2224
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2225 PyObject *
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2226 PyMethod_New(PyObject func, PyObject self, PyObject *klass)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2227 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2228 register PyMethodObject *im;
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2229 im = free_list;
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2230 if (im != NULL) {
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2231 free_list = (PyMethodObject *)(im->im_self);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12504 diff changeset	2232 PyObject_INIT(im, &PyMethod_Type);
45189 a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2233 numfree--;
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2234 }
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2235 else {
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2236 im = PyObject_GC_New(PyMethodObject, &PyMethod_Type);
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2237 if (im == NULL)
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2238 return NULL;
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2239 }
17170 962196ce7231 Add support for weak references to the function and method types. Fred Drake <fdrake@acm.org> parents: 17154 diff changeset	2240 im->im_weakreflist = NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2241 Py_INCREF(func);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	2242 im->im_func = func;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2243 Py_XINCREF(self);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	2244 im->im_self = self;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2245 Py_XINCREF(klass);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2246 im->im_class = klass;
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2247 _PyObject_GC_TRACK(im);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2248 return (PyObject *)im;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2249 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2250
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2251 /* Descriptors for PyMethod attributes */
33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2252
33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2253 /* im_class, im_func and im_self are stored in the PyMethod object */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2254
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2255 #define OFF(x) offsetof(PyMethodObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2256
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2257 static PyMemberDef instancemethod_memberlist[] = {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2258 {"im_class", T_OBJECT, OFF(im_class), READONLY\|RESTRICTED,
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2259 "the class associated with a method"},
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2260 {"im_func", T_OBJECT, OFF(im_func), READONLY\|RESTRICTED,
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2261 "the function (or other callable) implementing a method"},
45833 edcb3542176a Issue 2332: add new attribute names for instance method objects Neal Norwitz <nnorwitz@gmail.com> parents: 45341 diff changeset	2262 {"__func__", T_OBJECT, OFF(im_func), READONLY\|RESTRICTED,
edcb3542176a Issue 2332: add new attribute names for instance method objects Neal Norwitz <nnorwitz@gmail.com> parents: 45341 diff changeset	2263 "the function (or other callable) implementing a method"},
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2264 {"im_self", T_OBJECT, OFF(im_self), READONLY\|RESTRICTED,
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19966 diff changeset	2265 "the instance to which a method is bound; None for unbound methods"},
45833 edcb3542176a Issue 2332: add new attribute names for instance method objects Neal Norwitz <nnorwitz@gmail.com> parents: 45341 diff changeset	2266 {"__self__", T_OBJECT, OFF(im_self), READONLY\|RESTRICTED,
edcb3542176a Issue 2332: add new attribute names for instance method objects Neal Norwitz <nnorwitz@gmail.com> parents: 45341 diff changeset	2267 "the instance to which a method is bound; None for unbound methods"},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2268 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2269 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2270
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2271 /* Christian Tismer argued convincingly that method attributes should
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2272 (nearly) always override function attributes.
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2273 The one exception is __doc__; there's a default __doc__ which
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2274 should only be used for the class, not for instances */
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2275
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2276 static PyObject *
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2277 instancemethod_get_doc(PyMethodObject im, void context)
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2278 {
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2279 static PyObject *docstr;
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2280 if (docstr == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2281 docstr= PyString_InternFromString("__doc__");
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2282 if (docstr == NULL)
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2283 return NULL;
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2284 }
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2285 return PyObject_GetAttr(im->im_func, docstr);
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2286 }
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2287
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2288 static PyGetSetDef instancemethod_getset[] = {
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2289 {"__doc__", (getter)instancemethod_get_doc, NULL, NULL},
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2290 {0}
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2291 };
15894 1c6b0d3a58ea Committing PEP 232, function attribute feature, approved by Guido. Barry Warsaw <barry@python.org> parents: 15722 diff changeset	2292
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2293 static PyObject *
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2294 instancemethod_getattro(PyObject obj, PyObject name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2295 {
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2296 PyMethodObject im = (PyMethodObject )obj;
33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2297 PyTypeObject *tp = obj->ob_type;
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2298 PyObject *descr = NULL;
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2299
20501 733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	2300 if (PyType_HasFeature(tp, Py_TPFLAGS_HAVE_CLASS)) {
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	2301 if (tp->tp_dict == NULL) {
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	2302 if (PyType_Ready(tp) < 0)
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	2303 return NULL;
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	2304 }
733cb268ad2f Protect references to tp_descr_get and tp_dict with the appropriate test: Guido van Rossum <guido@python.org> parents: 20183 diff changeset	2305 descr = _PyType_Lookup(tp, name);
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2306 }
33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2307
33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2308 if (descr != NULL) {
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2309 descrgetfunc f = TP_DESCR_GET(descr->ob_type);
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2310 if (f != NULL)
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2311 return f(descr, obj, (PyObject *)obj->ob_type);
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2312 else {
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2313 Py_INCREF(descr);
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2314 return descr;
278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2315 }
3549 f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	2316 }
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2317
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2318 return PyObject_GetAttr(im->im_func, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2319 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	2320
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2321 PyDoc_STRVAR(instancemethod_doc,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2322 "instancemethod(function, instance, class)\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2323 \n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2324 Create an instance method object.");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2325
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2326 static PyObject *
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2327 instancemethod_new(PyTypeObject* type, PyObject* args, PyObject *kw)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2328 {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2329 PyObject *func;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2330 PyObject *self;
28560 e92c25d428b8 Make it possible to call instancemethod() with 2 arguments. Guido van Rossum <guido@python.org> parents: 28519 diff changeset	2331 PyObject *classObj = NULL;
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2332
39921 49fbddfb1217 Patch #1567691: super() and new.instancemethod() now don't accept Georg Brandl <georg@python.org> parents: 39582 diff changeset	2333 if (!_PyArg_NoKeywords("instancemethod", kw))
49fbddfb1217 Patch #1567691: super() and new.instancemethod() now don't accept Georg Brandl <georg@python.org> parents: 39582 diff changeset	2334 return NULL;
28560 e92c25d428b8 Make it possible to call instancemethod() with 2 arguments. Guido van Rossum <guido@python.org> parents: 28519 diff changeset	2335 if (!PyArg_UnpackTuple(args, "instancemethod", 2, 3,
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2336 &func, &self, &classObj))
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2337 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2338 if (!PyCallable_Check(func)) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2339 PyErr_SetString(PyExc_TypeError,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2340 "first argument must be callable");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2341 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2342 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2343 if (self == Py_None)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2344 self = NULL;
34850 aef713de7a23 Backport: Michael W. Hudson <mwh@python.net> parents: 33541 diff changeset	2345 if (self == NULL && classObj == NULL) {
aef713de7a23 Backport: Michael W. Hudson <mwh@python.net> parents: 33541 diff changeset	2346 PyErr_SetString(PyExc_TypeError,
aef713de7a23 Backport: Michael W. Hudson <mwh@python.net> parents: 33541 diff changeset	2347 "unbound methods must have non-NULL im_class");
aef713de7a23 Backport: Michael W. Hudson <mwh@python.net> parents: 33541 diff changeset	2348 return NULL;
aef713de7a23 Backport: Michael W. Hudson <mwh@python.net> parents: 33541 diff changeset	2349 }
aef713de7a23 Backport: Michael W. Hudson <mwh@python.net> parents: 33541 diff changeset	2350
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2351 return PyMethod_New(func, self, classObj);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2352 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2353
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2354 static void
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2355 instancemethod_dealloc(register PyMethodObject *im)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2356 {
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2357 _PyObject_GC_UNTRACK(im);
20698 b229208a2a72 Be smarter about clearing the weakref lists for instances, instance methods, Fred Drake <fdrake@acm.org> parents: 20601 diff changeset	2358 if (im->im_weakreflist != NULL)
b229208a2a72 Be smarter about clearing the weakref lists for instances, instance methods, Fred Drake <fdrake@acm.org> parents: 20601 diff changeset	2359 PyObject_ClearWeakRefs((PyObject *)im);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2360 Py_DECREF(im->im_func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2361 Py_XDECREF(im->im_self);
19332 0613fa57ae6d Instance methods: allow a NULL value for im_class. Guido van Rossum <guido@python.org> parents: 19323 diff changeset	2362 Py_XDECREF(im->im_class);
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45189 diff changeset	2363 if (numfree < PyMethod_MAXFREELIST) {
45189 a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2364 im->im_self = (PyObject *)free_list;
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2365 free_list = im;
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2366 numfree++;
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2367 }
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2368 else {
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2369 PyObject_GC_Del(im);
a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2370 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2371 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2372
1021 0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	2373 static int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2374 instancemethod_compare(PyMethodObject a, PyMethodObject b)
1021 0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	2375 {
38659 5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2376 int cmp;
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2377 cmp = PyObject_Compare(a->im_func, b->im_func);
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2378 if (cmp)
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2379 return cmp;
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2380
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2381 if (a->im_self == b->im_self)
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2382 return 0;
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2383 if (a->im_self == NULL \|\| b->im_self == NULL)
2641 f98a2233b337 change comparing instance methods Guido van Rossum <guido@python.org> parents: 2239 diff changeset	2384 return (a->im_self < b->im_self) ? -1 : 1;
38659 5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2385 else
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2386 return PyObject_Compare(a->im_self, b->im_self);
1021 0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	2387 }
0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	2388
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2389 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2390 instancemethod_repr(PyMethodObject *a)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	2391 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2392 PyObject *self = a->im_self;
8651 4ba9b70ca56e Marc-Andre Lemburg's patch to support instance methods with other Guido van Rossum <guido@python.org> parents: 8649 diff changeset	2393 PyObject *func = a->im_func;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2394 PyObject *klass = a->im_class;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2395 PyObject funcname = NULL, klassname = NULL, *result = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2396 char sfuncname = "?", sklassname = "?";
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2397
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2398 funcname = PyObject_GetAttrString(func, "__name__");
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2399 if (funcname == NULL) {
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2400 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2401 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2402 PyErr_Clear();
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2403 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2404 else if (!PyString_Check(funcname)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2405 Py_DECREF(funcname);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2406 funcname = NULL;
8651 4ba9b70ca56e Marc-Andre Lemburg's patch to support instance methods with other Guido van Rossum <guido@python.org> parents: 8649 diff changeset	2407 }
4ba9b70ca56e Marc-Andre Lemburg's patch to support instance methods with other Guido van Rossum <guido@python.org> parents: 8649 diff changeset	2408 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2409 sfuncname = PyString_AS_STRING(funcname);
19336 ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2410 if (klass == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2411 klassname = NULL;
19336 ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2412 else {
ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2413 klassname = PyObject_GetAttrString(klass, "__name__");
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2414 if (klassname == NULL) {
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2415 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2416 return NULL;
19336 ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2417 PyErr_Clear();
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2418 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2419 else if (!PyString_Check(klassname)) {
19336 ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2420 Py_DECREF(klassname);
ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2421 klassname = NULL;
ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2422 }
ebfb74ce7e56 Fix core dump in repr() of instancemethod whose class==NULL. Guido van Rossum <guido@python.org> parents: 19334 diff changeset	2423 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2424 sklassname = PyString_AS_STRING(klassname);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2425 }
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2426 if (self == NULL)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2427 result = PyString_FromFormat("<unbound method %s.%s>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19336 diff changeset	2428 sklassname, sfuncname);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2429 else {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2430 /* XXX Shouldn't use repr() here! */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2431 PyObject *selfrepr = PyObject_Repr(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2432 if (selfrepr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2433 goto fail;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2434 if (!PyString_Check(selfrepr)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2435 Py_DECREF(selfrepr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2436 goto fail;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2437 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2438 result = PyString_FromFormat("<bound method %s.%s of %s>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19336 diff changeset	2439 sklassname, sfuncname,
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2440 PyString_AS_STRING(selfrepr));
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2441 Py_DECREF(selfrepr);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2442 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2443 fail:
11378 dc9f1f964690 Fix for PR#98 (Adrian Eyre) -- in instancemethod_repr, the funcname Guido van Rossum <guido@python.org> parents: 8806 diff changeset	2444 Py_XDECREF(funcname);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2445 Py_XDECREF(klassname);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2446 return result;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	2447 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	2448
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2449 static long
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2450 instancemethod_hash(PyMethodObject *a)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2451 {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2452 long x, y;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2453 if (a->im_self == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2454 x = PyObject_Hash(Py_None);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	2455 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2456 x = PyObject_Hash(a->im_self);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2457 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2458 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2459 y = PyObject_Hash(a->im_func);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2460 if (y == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2461 return -1;
38659 5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2462 x = x ^ y;
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2463 if (x == -1)
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2464 x = -2;
5c58fda95aa5 (arre, arigo) SF bug #1350060 Armin Rigo <arigo@tunes.org> parents: 38485 diff changeset	2465 return x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2466 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	2467
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2468 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2469 instancemethod_traverse(PyMethodObject im, visitproc visit, void arg)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2470 {
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	2471 Py_VISIT(im->im_func);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	2472 Py_VISIT(im->im_self);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	2473 Py_VISIT(im->im_class);
12992 3f990ef66667 traverse functions should return 0 on success Jeremy Hylton <jeremy@alum.mit.edu> parents: 12990 diff changeset	2474 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2475 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2476
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2477 static void
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2478 getclassname(PyObject klass, char buf, int bufsize)
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2479 {
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2480 PyObject *name;
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2481
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2482 assert(bufsize > 1);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2483 strcpy(buf, "?"); /* Default outcome */
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2484 if (klass == NULL)
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2485 return;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2486 name = PyObject_GetAttrString(klass, "__name__");
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2487 if (name == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2488 /* This function cannot return an exception */
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2489 PyErr_Clear();
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2490 return;
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2491 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2492 if (PyString_Check(name)) {
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2493 strncpy(buf, PyString_AS_STRING(name), bufsize);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2494 buf[bufsize-1] = '\0';
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2495 }
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2496 Py_DECREF(name);
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2497 }
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2498
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2499 static void
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2500 getinstclassname(PyObject inst, char buf, int bufsize)
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2501 {
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2502 PyObject *klass;
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2503
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2504 if (inst == NULL) {
24910 5c38457f6b3b getinstclassname(): Squash new compiler wng in assert (comparison of Tim Peters <tim.peters@gmail.com> parents: 24901 diff changeset	2505 assert(bufsize > 0 && (size_t)bufsize > strlen("nothing"));
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2506 strcpy(buf, "nothing");
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2507 return;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2508 }
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2509
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2510 klass = PyObject_GetAttrString(inst, "__class__");
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2511 if (klass == NULL) {
23842 6c619c161b87 Major cleanup operation: whenever there's a call that looks for an Guido van Rossum <guido@python.org> parents: 23839 diff changeset	2512 /* This function cannot return an exception */
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2513 PyErr_Clear();
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2514 klass = (PyObject *)(inst->ob_type);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2515 Py_INCREF(klass);
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2516 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2517 getclassname(klass, buf, bufsize);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2518 Py_XDECREF(klass);
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2519 }
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2520
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2521 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2522 instancemethod_call(PyObject func, PyObject arg, PyObject *kw)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2523 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2524 PyObject *self = PyMethod_GET_SELF(func);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2525 PyObject *klass = PyMethod_GET_CLASS(func);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2526 PyObject *result;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2527
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2528 func = PyMethod_GET_FUNCTION(func);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2529 if (self == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2530 /* Unbound methods must be called with an instance of
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2531 the class (or a derived class) as first argument */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2532 int ok;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2533 if (PyTuple_Size(arg) >= 1)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2534 self = PyTuple_GET_ITEM(arg, 0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2535 if (self == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2536 ok = 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2537 else {
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2538 ok = PyObject_IsInstance(self, klass);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2539 if (ok < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2540 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2541 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2542 if (!ok) {
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2543 char clsbuf[256];
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2544 char instbuf[256];
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	2545 getclassname(klass, clsbuf, sizeof(clsbuf));
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2546 getinstclassname(self, instbuf, sizeof(instbuf));
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2547 PyErr_Format(PyExc_TypeError,
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2548 "unbound method %s%s must be called with "
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2549 "%s instance as first argument "
984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2550 "(got %s%s instead)",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2551 PyEval_GetFuncName(func),
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2552 PyEval_GetFuncDesc(func),
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2553 clsbuf,
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24184 diff changeset	2554 instbuf,
19480 984ffa124606 Improve the error message issued when an unbound method is called with Guido van Rossum <guido@python.org> parents: 19476 diff changeset	2555 self == NULL ? "" : " instance");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2556 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2557 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2558 Py_INCREF(arg);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2559 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2560 else {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2561 Py_ssize_t argcount = PyTuple_Size(arg);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2562 PyObject *newarg = PyTuple_New(argcount + 1);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2563 int i;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2564 if (newarg == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2565 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2566 Py_INCREF(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2567 PyTuple_SET_ITEM(newarg, 0, self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2568 for (i = 0; i < argcount; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2569 PyObject *v = PyTuple_GET_ITEM(arg, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2570 Py_XINCREF(v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2571 PyTuple_SET_ITEM(newarg, i+1, v);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2572 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2573 arg = newarg;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2574 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2575 result = PyObject_Call((PyObject *)func, arg, kw);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2576 Py_DECREF(arg);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2577 return result;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2578 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2579
19280 f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2580 static PyObject *
27817 bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2581 instancemethod_descr_get(PyObject meth, PyObject obj, PyObject *cls)
19280 f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2582 {
19334 60264d1e100e instance_getattr2(): rewritten to remove unnecessary stuff and Guido van Rossum <guido@python.org> parents: 19332 diff changeset	2583 /* Don't rebind an already bound method, or an unbound method
27817 bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2584 of a class that's not a base class of cls. */
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2585
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2586 if (PyMethod_GET_SELF(meth) != NULL) {
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2587 /* Already bound */
19323 261e28e7fa01 classobject.c:instancemethod_descr_get(): when a bound method is Guido van Rossum <guido@python.org> parents: 19280 diff changeset	2588 Py_INCREF(meth);
261e28e7fa01 classobject.c:instancemethod_descr_get(): when a bound method is Guido van Rossum <guido@python.org> parents: 19280 diff changeset	2589 return meth;
261e28e7fa01 classobject.c:instancemethod_descr_get(): when a bound method is Guido van Rossum <guido@python.org> parents: 19280 diff changeset	2590 }
27817 bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2591 /* No, it is an unbound method */
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2592 if (PyMethod_GET_CLASS(meth) != NULL && cls != NULL) {
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2593 /* Do subclass test. If it fails, return meth unchanged. */
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2594 int ok = PyObject_IsSubclass(cls, PyMethod_GET_CLASS(meth));
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2595 if (ok < 0)
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2596 return NULL;
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2597 if (!ok) {
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2598 Py_INCREF(meth);
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2599 return meth;
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2600 }
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2601 }
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2602 /* Bind it to obj */
bf083e35185f Refactor instancemethod_descr_get() to (a) be more clear, (b) be safe Guido van Rossum <guido@python.org> parents: 26818 diff changeset	2603 return PyMethod_New(PyMethod_GET_FUNCTION(meth), obj, cls);
19280 f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2604 }
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2605
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2606 PyTypeObject PyMethod_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	2607 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2608 0,
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2609 "instancemethod",
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2610 sizeof(PyMethodObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2611 0,
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2612 (destructor)instancemethod_dealloc, /* tp_dealloc */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2613 0, /* tp_print */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2614 0, /* tp_getattr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2615 0, /* tp_setattr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2616 (cmpfunc)instancemethod_compare, /* tp_compare */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2617 (reprfunc)instancemethod_repr, /* tp_repr */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2618 0, /* tp_as_number */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2619 0, /* tp_as_sequence */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2620 0, /* tp_as_mapping */
5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2621 (hashfunc)instancemethod_hash, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17894 diff changeset	2622 instancemethod_call, /* tp_call */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2623 0, /* tp_str */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	2624 instancemethod_getattro, /* tp_getattro */
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2625 PyObject_GenericSetAttr, /* tp_setattro */
15943 5b063baebef8 Rich comparisons. Guido van Rossum <guido@python.org> parents: 15894 diff changeset	2626 0, /* tp_as_buffer */
35111 ab83ab27c837 Insert missing flag. Raymond Hettinger <python@rcn.com> parents: 34850 diff changeset	2627 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \| Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2628 instancemethod_doc, /* tp_doc */
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2629 (traverseproc)instancemethod_traverse, /* tp_traverse */
17170 962196ce7231 Add support for weak references to the function and method types. Fred Drake <fdrake@acm.org> parents: 17154 diff changeset	2630 0, /* tp_clear */
962196ce7231 Add support for weak references to the function and method types. Fred Drake <fdrake@acm.org> parents: 17154 diff changeset	2631 0, /* tp_richcompare */
19280 f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2632 offsetof(PyMethodObject, im_weakreflist), /* tp_weaklistoffset */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2633 0, /* tp_iter */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2634 0, /* tp_iternext */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2635 0, /* tp_methods */
19956 33669c8914b4 Redo the PyMethod attributes using a dir()-friendly approach, creating Guido van Rossum <guido@python.org> parents: 19808 diff changeset	2636 instancemethod_memberlist, /* tp_members */
31003 278976b19dcc - When method objects have an attribute that can be satisfied either Guido van Rossum <guido@python.org> parents: 30801 diff changeset	2637 instancemethod_getset, /* tp_getset */
19280 f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2638 0, /* tp_base */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2639 0, /* tp_dict */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2640 instancemethod_descr_get, /* tp_descr_get */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2641 0, /* tp_descr_set */
f10b68eceefc PyMethod_Type: add a tp_descr_get slot function to ensure proper Guido van Rossum <guido@python.org> parents: 19051 diff changeset	2642 0, /* tp_dictoffset */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2643 0, /* tp_init */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2644 0, /* tp_alloc */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23842 diff changeset	2645 instancemethod_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2646 };
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2647
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2648 /* Clear out the free list */
40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2649
45341 65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2650 int
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2651 PyMethod_ClearFreeList(void)
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2652 {
45341 65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2653 int freelist_size = numfree;
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2654
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2655 while (free_list) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12504 diff changeset	2656 PyMethodObject *im = free_list;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12504 diff changeset	2657 free_list = (PyMethodObject *)(im->im_self);
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19480 diff changeset	2658 PyObject_GC_Del(im);
45189 a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2659 numfree--;
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2660 }
45189 a4c87c889648 Limit free list of method and builtin function objects to 256 entries each. Christian Heimes <christian@cheimes.de> parents: 45142 diff changeset	2661 assert(numfree == 0);
45341 65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2662 return freelist_size;
5932 40cfc905c776 Added separate free list for instance method objects, for a few Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2663 }
45341 65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2664
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2665 void
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2666 PyMethod_Fini(void)
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2667 {
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2668 (void)PyMethod_ClearFreeList();
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	2669 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/classobject.c @ 58765:2ba7677bfa95 legacy-trunk