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

annotate Objects/classobject.c @ 33091:48100a01ac7c 2.3

Ignore the locale's encoding if it is an empty string.

author	Martin v. Löwis <martin@v.loewis.de>
date	Thu, 12 Aug 2004 13:14:20 +0000
parents	ef4a71f5af22
children	3b59fa5d25b1

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/classobject.c @ 33091:48100a01ac7c 2.3