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

annotate Objects/object.c @ 41601:b39abcbbbbba

It's ok for __repr__ to return unicode.

author	Guido van Rossum <guido@python.org>
date	Fri, 04 May 2007 05:14:29 +0000
parents	2c54763c4504
children	ddc4be2786fd

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 95 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	2 /* Generic object operations; and implementation of None (NoObject) */
6 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: 5006 diff changeset	4 #include "Python.h"
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	5 #include "sliceobject.h" /* For PyEllipsis_Type */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	7 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	8 extern "C" {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	9 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	10
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24155 diff changeset	11 #ifdef Py_REF_DEBUG
36838 dedc2c94d112 Oops, forgot to include this in the last checkin. Neal Norwitz <nnorwitz@gmail.com> parents: 36759 diff changeset	12 Py_ssize_t _Py_RefTotal;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	13
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	14 Py_ssize_t
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	15 _Py_GetRefTotal(void)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	16 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	17 PyObject *o;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	18 Py_ssize_t total = _Py_RefTotal;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	19 /* ignore the references to the dummy object of the dicts and sets
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	20 because they are not reliable and not useful (now that the
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	21 hash table code is well-tested) */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	22 o = _PyDict_Dummy();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	23 if (o != NULL)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	24 total -= o->ob_refcnt;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	25 o = _PySet_Dummy();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	26 if (o != NULL)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	27 total -= o->ob_refcnt;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	28 return total;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	29 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	30 #endif /* Py_REF_DEBUG */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31
24420 36e2fd3f08f7 Excise DL_IMPORT/EXPORT from object.h, and related files. This patch Mark Hammond <mhammond@skippinet.com.au> parents: 24184 diff changeset	32 int Py_DivisionWarningFlag;
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19620 diff changeset	33
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	34 /* Object allocation routines used by NEWOBJ and NEWVAROBJ macros.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	35 These are used by the individual routines for object creation.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	36 Do not call them otherwise, they do not initialize the object! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	37
28387 983e9291a7b4 When Py_TRACE_REFS is defined, a list of all live objects is maintained in Tim Peters <tim.peters@gmail.com> parents: 28320 diff changeset	38 #ifdef Py_TRACE_REFS
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	39 /* Head of circular doubly-linked list of all objects. These are linked
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	40 * together via the _ob_prev and _ob_next members of a PyObject, which
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	41 * exist only in a Py_TRACE_REFS build.
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	42 */
28387 983e9291a7b4 When Py_TRACE_REFS is defined, a list of all live objects is maintained in Tim Peters <tim.peters@gmail.com> parents: 28320 diff changeset	43 static PyObject refchain = {&refchain, &refchain};
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28388 diff changeset	44
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	45 /* Insert op at the front of the list of all objects. If force is true,
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	46 * op is added even if _ob_prev and _ob_next are non-NULL already. If
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	47 * force is false amd _ob_prev or _ob_next are non-NULL, do nothing.
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	48 * force should be true if and only if op points to freshly allocated,
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	49 * uninitialized memory, or you've unlinked op from the list and are
28397 4f038d3a8878 Typo in comment. Tim Peters <tim.peters@gmail.com> parents: 28396 diff changeset	50 * relinking it into the front.
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	51 * Note that objects are normally added to the list via _Py_NewReference,
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	52 * which is called by PyObject_Init. Not all objects are initialized that
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	53 * way, though; exceptions include statically allocated type objects, and
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	54 * statically allocated singletons (like Py_True and Py_None).
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	55 */
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28388 diff changeset	56 void
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	57 _Py_AddToAllObjects(PyObject *op, int force)
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28388 diff changeset	58 {
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	59 #ifdef Py_DEBUG
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	60 if (!force) {
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	61 /* If it's initialized memory, op must be in or out of
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	62 * the list unambiguously.
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	63 */
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	64 assert((op->_ob_prev == NULL) == (op->_ob_next == NULL));
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	65 }
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	66 #endif
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	67 if (force \|\| op->_ob_prev == NULL) {
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	68 op->_ob_next = refchain._ob_next;
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	69 op->_ob_prev = &refchain;
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	70 refchain._ob_next->_ob_prev = op;
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	71 refchain._ob_next = op;
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	72 }
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28388 diff changeset	73 }
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	74 #endif /* Py_TRACE_REFS */
28387 983e9291a7b4 When Py_TRACE_REFS is defined, a list of all live objects is maintained in Tim Peters <tim.peters@gmail.com> parents: 28320 diff changeset	75
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	76 #ifdef COUNT_ALLOCS
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	77 static PyTypeObject *type_list;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	78 /* All types are added to type_list, at least when
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	79 they get one object created. That makes them
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	80 immortal, which unfortunately contributes to
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	81 garbage itself. If unlist_types_without_objects
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	82 is set, they will be removed from the type_list
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	83 once the last object is deallocated. */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	84 int unlist_types_without_objects;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	85 extern int tuple_zero_allocs, fast_tuple_allocs;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	86 extern int quick_int_allocs, quick_neg_int_allocs;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1352 diff changeset	87 extern int null_strings, one_strings;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	88 void
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	89 dump_counts(FILE* f)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	90 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	91 PyTypeObject *tp;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	92
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	93 for (tp = type_list; tp; tp = tp->tp_next)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	94 fprintf(f, "%s alloc'd: %d, freed: %d, max in use: %d\n",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	95 tp->tp_name, tp->tp_allocs, tp->tp_frees,
1361 7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	96 tp->tp_maxalloc);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	97 fprintf(f, "fast tuple allocs: %d, empty: %d\n",
1361 7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	98 fast_tuple_allocs, tuple_zero_allocs);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	99 fprintf(f, "fast int allocs: pos: %d, neg: %d\n",
1361 7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	100 quick_int_allocs, quick_neg_int_allocs);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	101 fprintf(f, "null strings: %d, 1-strings: %d\n",
1361 7cd533cf194a import.c: When something is wrong with the .pyc, properly open the .py Sjoerd Mullender <sjoerd@acm.org> parents: 1356 diff changeset	102 null_strings, one_strings);
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	103 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	104
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	105 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	106 get_counts(void)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	107 {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	108 PyTypeObject *tp;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	109 PyObject *result;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	110 PyObject *v;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	111
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	112 result = PyList_New(0);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	113 if (result == NULL)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	114 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	115 for (tp = type_list; tp; tp = tp->tp_next) {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 37927 diff changeset	116 v = Py_BuildValue("(snnn)", tp->tp_name, tp->tp_allocs,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	117 tp->tp_frees, tp->tp_maxalloc);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	118 if (v == NULL) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	119 Py_DECREF(result);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	120 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	121 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	122 if (PyList_Append(result, v) < 0) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	123 Py_DECREF(v);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	124 Py_DECREF(result);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	125 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	126 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	127 Py_DECREF(v);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	128 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	129 return result;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	130 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	131
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	132 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	133 inc_count(PyTypeObject *tp)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	134 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	135 if (tp->tp_next == NULL && tp->tp_prev == NULL) {
2639 f11ba9cc342f change in counting freed objects Guido van Rossum <guido@python.org> parents: 2612 diff changeset	136 /* first time; insert in linked list */
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	137 if (tp->tp_next != NULL) /* sanity check */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	138 Py_FatalError("XXX inc_count sanity check");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	139 if (type_list)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	140 type_list->tp_prev = tp;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	141 tp->tp_next = type_list;
24144 d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	142 /* Note that as of Python 2.2, heap-allocated type objects
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	143 * can go away, but this code requires that they stay alive
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	144 * until program exit. That's why we're careful with
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	145 * refcounts here. type_list gets a new reference to tp,
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	146 * while ownership of the reference type_list used to hold
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	147 * (if any) was transferred to tp->tp_next in the line above.
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	148 * tp is thus effectively immortal after this.
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	149 */
d7d816e1f522 SF bug 578752: COUNT_ALLOCS vs heap types Tim Peters <tim.peters@gmail.com> parents: 24126 diff changeset	150 Py_INCREF(tp);
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	151 type_list = tp;
28388 f81239c12c60 Oops! Used a wrong preprocessor symbol. Tim Peters <tim.peters@gmail.com> parents: 28387 diff changeset	152 #ifdef Py_TRACE_REFS
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	153 /* Also insert in the doubly-linked list of all objects,
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	154 * if not already there.
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	155 */
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	156 _Py_AddToAllObjects((PyObject *)tp, 0);
28387 983e9291a7b4 When Py_TRACE_REFS is defined, a list of all live objects is maintained in Tim Peters <tim.peters@gmail.com> parents: 28320 diff changeset	157 #endif
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	158 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	159 tp->tp_allocs++;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	160 if (tp->tp_allocs - tp->tp_frees > tp->tp_maxalloc)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	161 tp->tp_maxalloc = tp->tp_allocs - tp->tp_frees;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	162 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	163
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	164 void dec_count(PyTypeObject *tp)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	165 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	166 tp->tp_frees++;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	167 if (unlist_types_without_objects &&
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	168 tp->tp_allocs == tp->tp_frees) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	169 /* unlink the type from type_list */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	170 if (tp->tp_prev)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	171 tp->tp_prev->tp_next = tp->tp_next;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	172 else
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	173 type_list = tp->tp_next;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	174 if (tp->tp_next)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	175 tp->tp_next->tp_prev = tp->tp_prev;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	176 tp->tp_next = tp->tp_prev = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	177 Py_DECREF(tp);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	178 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	179 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	180
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	181 #endif
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	182
24155 9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	183 #ifdef Py_REF_DEBUG
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	184 /* Log a fatal error; doesn't return. */
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	185 void
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	186 _Py_NegativeRefcount(const char fname, int lineno, PyObject op)
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	187 {
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	188 char buf[300];
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	189
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	190 PyOS_snprintf(buf, sizeof(buf),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	191 "%s:%i object at %p has negative ref count "
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	192 "%" PY_FORMAT_SIZE_T "d",
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	193 fname, lineno, op, op->ob_refcnt);
24155 9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	194 Py_FatalError(buf);
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	195 }
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	196
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	197 #endif /* Py_REF_DEBUG */
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	198
31940 059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	199 void
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	200 Py_IncRef(PyObject *o)
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	201 {
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	202 Py_XINCREF(o);
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	203 }
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	204
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	205 void
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	206 Py_DecRef(PyObject *o)
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	207 {
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	208 Py_XDECREF(o);
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	209 }
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	210
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	211 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	212 PyObject_Init(PyObject op, PyTypeObject tp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	213 {
25737 b0fa5f6a8bb9 PyObject_Init[Var] is almost always called from the PyObject_NEW[_VAR] Guido van Rossum <guido@python.org> parents: 25015 diff changeset	214 if (op == NULL)
b0fa5f6a8bb9 PyObject_Init[Var] is almost always called from the PyObject_NEW[_VAR] Guido van Rossum <guido@python.org> parents: 25015 diff changeset	215 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	216 /* Any changes should be reflected in PyObject_INIT (objimpl.h) */
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	217 op->ob_type = tp;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	218 _Py_NewReference(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219 return op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	220 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	221
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	222 PyVarObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	223 PyObject_InitVar(PyVarObject op, PyTypeObject tp, Py_ssize_t size)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	224 {
25737 b0fa5f6a8bb9 PyObject_Init[Var] is almost always called from the PyObject_NEW[_VAR] Guido van Rossum <guido@python.org> parents: 25015 diff changeset	225 if (op == NULL)
b0fa5f6a8bb9 PyObject_Init[Var] is almost always called from the PyObject_NEW[_VAR] Guido van Rossum <guido@python.org> parents: 25015 diff changeset	226 return (PyVarObject *) PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	227 /* Any changes should be reflected in PyObject_INIT_VAR */
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	228 op->ob_size = size;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	229 op->ob_type = tp;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	230 _Py_NewReference((PyObject *)op);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	231 return op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	232 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	233
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	234 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	235 _PyObject_New(PyTypeObject *tp)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	236 {
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	237 PyObject *op;
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	238 op = (PyObject *) PyObject_MALLOC(_PyObject_SIZE(tp));
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	239 if (op == NULL)
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	240 return PyErr_NoMemory();
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	241 return PyObject_INIT(op, tp);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	242 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	243
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	244 PyVarObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	245 _PyObject_NewVar(PyTypeObject *tp, Py_ssize_t nitems)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	246 {
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	247 PyVarObject *op;
20296 6cc0b48049ec Guido suggests, and I agree, to insist that SIZEOF_VOID_P be a power of 2. Tim Peters <tim.peters@gmail.com> parents: 20294 diff changeset	248 const size_t size = _PyObject_VAR_SIZE(tp, nitems);
20294 426b379a138b _PyObject_VAR_SIZE: always round up to a multiple-of-pointer-size value. Tim Peters <tim.peters@gmail.com> parents: 20292 diff changeset	249 op = (PyVarObject *) PyObject_MALLOC(size);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	250 if (op == NULL)
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	251 return (PyVarObject *)PyErr_NoMemory();
20294 426b379a138b _PyObject_VAR_SIZE: always round up to a multiple-of-pointer-size value. Tim Peters <tim.peters@gmail.com> parents: 20292 diff changeset	252 return PyObject_INIT_VAR(op, tp, nitems);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	253 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	254
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	255 /* Implementation of PyObject_Print with recursion checking */
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	256 static int
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	257 internal_print(PyObject op, FILE fp, int flags, int nesting)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	258 {
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	259 int ret = 0;
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	260 if (nesting > 10) {
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	261 PyErr_SetString(PyExc_RuntimeError, "print recursion");
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	262 return -1;
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	263 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	264 if (PyErr_CheckSignals())
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	265 return -1;
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	266 #ifdef USE_STACKCHECK
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	267 if (PyOS_CheckStack()) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	268 PyErr_SetString(PyExc_MemoryError, "stack overflow");
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	269 return -1;
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	270 }
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	271 #endif
11649 38560a3a3249 On Linux, one sometimes sees spurious errors after interrupting Guido van Rossum <guido@python.org> parents: 8695 diff changeset	272 clearerr(fp); /* Clear any previous error condition */
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	273 if (op == NULL) {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	274 fprintf(fp, "<nil>");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	275 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	276 else {
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	277 if (op->ob_refcnt <= 0)
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	278 /* XXX(twouters) cast refcount to long until %zd is
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	279 universally available */
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	280 fprintf(fp, "<refcnt %ld at %p>",
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	281 (long)op->ob_refcnt, op);
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	282 else if (op->ob_type->tp_print == NULL) {
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	283 PyObject *s;
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	284 if (flags & Py_PRINT_RAW)
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	285 s = PyObject_Str(op);
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	286 else
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	287 s = PyObject_Repr(op);
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	288 if (s == NULL)
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	289 ret = -1;
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	290 else {
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	291 ret = internal_print(s, fp, Py_PRINT_RAW,
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	292 nesting+1);
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	293 }
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	294 Py_XDECREF(s);
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	295 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	296 else
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	297 ret = (*op->ob_type->tp_print)(op, fp, flags);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	298 }
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	299 if (ret == 0) {
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	300 if (ferror(fp)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	301 PyErr_SetFromErrno(PyExc_IOError);
322 1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	302 clearerr(fp);
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	303 ret = -1;
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	304 }
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	305 }
1a6cf1f8ccec Check for write errors after printing a value Guido van Rossum <guido@python.org> parents: 307 diff changeset	306 return ret;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	309 int
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	310 PyObject_Print(PyObject op, FILE fp, int flags)
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	311 {
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	312 return internal_print(op, fp, flags, 0);
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	313 }
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	314
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	315 /* For debugging convenience. Set a breakpoint here and call it from your DLL */
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	316 void
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40485 diff changeset	317 _Py_BreakPoint(void)
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	318 {
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	319 }
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	320
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	321
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	322 /* For debugging convenience. See Misc/gdbinit for some useful gdb hooks */
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	323 void
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	324 _PyObject_Dump(PyObject* op)
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	325 {
16742 db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	326 if (op == NULL)
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	327 fprintf(stderr, "NULL\n");
db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	328 else {
19906 f39a9be7c9af _PyObject_Dump(): print the type of the object. This is by far the Guido van Rossum <guido@python.org> parents: 19846 diff changeset	329 fprintf(stderr, "object : ");
16742 db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	330 (void)PyObject_Print(op, stderr, 0);
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	331 /* XXX(twouters) cast refcount to long until %zd is
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	332 universally available */
19906 f39a9be7c9af _PyObject_Dump(): print the type of the object. This is by far the Guido van Rossum <guido@python.org> parents: 19846 diff changeset	333 fprintf(stderr, "\n"
f39a9be7c9af _PyObject_Dump(): print the type of the object. This is by far the Guido van Rossum <guido@python.org> parents: 19846 diff changeset	334 "type : %s\n"
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	335 "refcount: %ld\n"
19906 f39a9be7c9af _PyObject_Dump(): print the type of the object. This is by far the Guido van Rossum <guido@python.org> parents: 19846 diff changeset	336 "address : %p\n",
f39a9be7c9af _PyObject_Dump(): print the type of the object. This is by far the Guido van Rossum <guido@python.org> parents: 19846 diff changeset	337 op->ob_type==NULL ? "NULL" : op->ob_type->tp_name,
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	338 (long)op->ob_refcnt,
19906 f39a9be7c9af _PyObject_Dump(): print the type of the object. This is by far the Guido van Rossum <guido@python.org> parents: 19846 diff changeset	339 op);
16742 db61894b0d6f _PyObject_Dump(): If argument is NULL, print "NULL" instead of Barry Warsaw <barry@python.org> parents: 16741 diff changeset	340 }
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	341 }
16167 71ceaba3f615 PyObject_Dump(): Use %p format to print the address of the pointer. Barry Warsaw <barry@python.org> parents: 16165 diff changeset	342
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	343 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	344 PyObject_Repr(PyObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	345 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	346 if (PyErr_CheckSignals())
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	347 return NULL;
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	348 #ifdef USE_STACKCHECK
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	349 if (PyOS_CheckStack()) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	350 PyErr_SetString(PyExc_MemoryError, "stack overflow");
8181 c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	351 return NULL;
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	352 }
c69ad566aeb1 If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str Guido van Rossum <guido@python.org> parents: 8111 diff changeset	353 #endif
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 231 diff changeset	354 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	355 return PyString_FromString("<NULL>");
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19343 diff changeset	356 else if (v->ob_type->tp_repr == NULL)
19620 b706c027c3c0 PyObject_Repr(): add missing ">" back at end of format string: "<%s Guido van Rossum <guido@python.org> parents: 19580 diff changeset	357 return PyString_FromFormat("<%s object at %p>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19343 diff changeset	358 v->ob_type->tp_name, v);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	359 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	360 PyObject *res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	361 res = (*v->ob_type->tp_repr)(v);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	362 if (res == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	363 return NULL;
41601 b39abcbbbbba It's ok for __repr__ to return unicode. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	364 if (PyUnicode_Check(res))
b39abcbbbbba It's ok for __repr__ to return unicode. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	365 return res;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	366 if (!PyString_Check(res)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	367 PyErr_Format(PyExc_TypeError,
12320 5de0b939fe61 Skip Montanaro: add string precisions to calls to PyErr_Format Guido van Rossum <guido@python.org> parents: 12052 diff changeset	368 "__repr__ returned non-string (type %.200s)",
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	369 res->ob_type->tp_name);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	370 Py_DECREF(res);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	371 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	372 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	373 return res;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	374 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	375 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	376
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	377 PyObject *
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	378 _PyObject_Str(PyObject *v)
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	379 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	380 PyObject *res;
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	381 int type_ok;
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	382 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	383 return PyString_FromString("<NULL>");
19846 662e22f99639 More on SF bug [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19833 diff changeset	384 if (PyString_CheckExact(v)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	385 Py_INCREF(v);
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	386 return v;
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	387 }
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	388 if (PyUnicode_CheckExact(v)) {
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	389 Py_INCREF(v);
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	390 return v;
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	391 }
17646 d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	392 if (v->ob_type->tp_str == NULL)
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	393 return PyObject_Repr(v);
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	394
d1ec679baa3d Printing objects to a real file still wasn't done right: if the Guido van Rossum <guido@python.org> parents: 17639 diff changeset	395 res = (*v->ob_type->tp_str)(v);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	396 if (res == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	397 return NULL;
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	398 type_ok = PyString_Check(res);
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	399 type_ok = type_ok \|\| PyUnicode_Check(res);
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	400 if (!type_ok) {
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	401 PyErr_Format(PyExc_TypeError,
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	402 "__str__ returned non-string (type %.200s)",
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	403 res->ob_type->tp_name);
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	404 Py_DECREF(res);
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	405 return NULL;
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	406 }
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	407 return res;
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	408 }
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	409
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	410 PyObject *
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	411 PyObject_Str(PyObject *v)
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	412 {
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	413 PyObject *res = _PyObject_Str(v);
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	414 if (res == NULL)
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	415 return NULL;
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	416 if (PyUnicode_Check(res)) {
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	417 PyObject* str;
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	418 str = _PyUnicode_AsDefaultEncodedString(res, NULL);
2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	419 Py_XINCREF(str);
13319 390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	420 Py_DECREF(res);
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	421 if (str)
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	422 res = str;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	423 else
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	424 return NULL;
390e5d51ff73 If auto-conversion fails, the Unicode codecs will return NULL. Marc-André Lemburg <mal@egenix.com> parents: 13293 diff changeset	425 }
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	426 assert(PyString_Check(res));
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	427 return res;
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	428 }
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	429
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	430 PyObject *
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	431 PyObject_Unicode(PyObject *v)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	432 {
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	433 PyObject *res;
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	434 PyObject *func;
36977 95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	435 PyObject *str;
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	436 static PyObject *unicodestr;
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	437
36975 bdafca2192d3 Fix bug found by Coverity: don't allow NULL argument to PyUnicode_CheckExact Georg Brandl <georg@python.org> parents: 36866 diff changeset	438 if (v == NULL) {
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	439 res = PyString_FromString("<NULL>");
36977 95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	440 if (res == NULL)
95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	441 return NULL;
95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	442 str = PyUnicode_FromEncodedObject(res, NULL, "strict");
95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	443 Py_DECREF(res);
95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	444 return str;
36975 bdafca2192d3 Fix bug found by Coverity: don't allow NULL argument to PyUnicode_CheckExact Georg Brandl <georg@python.org> parents: 36866 diff changeset	445 } else if (PyUnicode_CheckExact(v)) {
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	446 Py_INCREF(v);
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	447 return v;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	448 }
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	449 /* XXX As soon as we have a tp_unicode slot, we should
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	450 check this before trying the __unicode__
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	451 method. */
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	452 if (unicodestr == NULL) {
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	453 unicodestr= PyString_InternFromString("__unicode__");
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	454 if (unicodestr == NULL)
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	455 return NULL;
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20464 diff changeset	456 }
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	457 func = PyObject_GetAttr(v, unicodestr);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	458 if (func != NULL) {
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	459 res = PyEval_CallObject(func, (PyObject *)NULL);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	460 Py_DECREF(func);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	461 }
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	462 else {
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	463 PyErr_Clear();
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	464 if (PyUnicode_Check(v)) {
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	465 /* For a Unicode subtype that's didn't overwrite __unicode__,
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	466 return a true Unicode object with the same data. */
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	467 return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(v),
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	468 PyUnicode_GET_SIZE(v));
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	469 }
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	470 if (PyString_CheckExact(v)) {
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	471 Py_INCREF(v);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34248 diff changeset	472 res = v;
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	473 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	474 else {
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20464 diff changeset	475 if (v->ob_type->tp_str != NULL)
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20464 diff changeset	476 res = (*v->ob_type->tp_str)(v);
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20464 diff changeset	477 else
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20464 diff changeset	478 res = PyObject_Repr(v);
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	479 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	480 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	481 if (res == NULL)
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	482 return NULL;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	483 if (!PyUnicode_Check(res)) {
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20464 diff changeset	484 str = PyUnicode_FromEncodedObject(res, NULL, "strict");
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	485 Py_DECREF(res);
36977 95469e97fd90 Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and Neal Norwitz <nnorwitz@gmail.com> parents: 36975 diff changeset	486 res = str;
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	487 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	488 return res;
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	489 }
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	490
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	491
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	492 /* The new comparison philosophy is: we completely separate three-way
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	493 comparison from rich comparison. That is, PyObject_Compare() and
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	494 PyObject_Cmp() just use the tp_compare slot. And PyObject_RichCompare()
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	495 and PyObject_RichCompareBool() just use the tp_richcompare slot.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	496
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	497 See (*) below for practical amendments.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	498
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	499 IOW, only cmp() uses tp_compare; the comparison operators (==, !=, <=, <,
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	500 >=, >) only use tp_richcompare. Note that list.sort() only uses <.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	501
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	502 (And yes, eventually we'll rip out cmp() and tp_compare.)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	503
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	504 The calling conventions are different: tp_compare only gets called with two
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	505 objects of the appropriate type; tp_richcompare gets called with a first
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	506 argument of the appropriate type and a second object of an arbitrary type.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	507 We never do any kind of coercion.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	508
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	509 The return conventions are also different.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	510
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	511 The tp_compare slot should return a C int, as follows:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	512
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	513 -1 if a < b or if an exception occurred
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	514 0 if a == b
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	515 +1 if a > b
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	516
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	517 No other return values are allowed. PyObject_Compare() has the same
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	518 calling convention.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	519
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	520 The tp_richcompare slot should return an object, as follows:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	521
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	522 NULL if an exception occurred
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	523 NotImplemented if the requested comparison is not implemented
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	524 any other false value if the requested comparison is false
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	525 any other true value if the requested comparison is true
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	526
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	527 The PyObject_RichCompare[Bool]() wrappers raise TypeError when they get
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	528 NotImplemented.
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	529
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	530 (*) Practical amendments:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	531
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	532 - If rich comparison returns NotImplemented, == and != are decided by
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	533 comparing the object pointer (i.e. falling back to the base object
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	534 implementation).
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	535
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	536 - If three-way comparison is not implemented, it falls back on rich
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	537 comparison (but not the other way around!).
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	538
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	539 */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	540
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	541 /* Forward */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	542 static PyObject do_richcompare(PyObject v, PyObject *w, int op);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	543
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	544 /* Perform a three-way comparison, raising TypeError if three-way comparison
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	545 is not supported. */
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	546 static int
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	547 do_compare(PyObject v, PyObject w)
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	548 {
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	549 cmpfunc f;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	550 int ok;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	551
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	552 if (v->ob_type == w->ob_type &&
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	553 (f = v->ob_type->tp_compare) != NULL) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	554 return (*f)(v, w);
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	555 }
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	556
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	557 /* Now try three-way compare before giving up. This is intentionally
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	558 elaborate; if you have a it will raise TypeError if it detects two
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	559 objects that aren't ordered with respect to each other. */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	560 ok = PyObject_RichCompareBool(v, w, Py_LT);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	561 if (ok < 0)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	562 return -1; /* Error */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	563 if (ok)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	564 return -1; /* Less than */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	565 ok = PyObject_RichCompareBool(v, w, Py_GT);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	566 if (ok < 0)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	567 return -1; /* Error */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	568 if (ok)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	569 return 1; /* Greater than */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	570 ok = PyObject_RichCompareBool(v, w, Py_EQ);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	571 if (ok < 0)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	572 return -1; /* Error */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	573 if (ok)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	574 return 0; /* Equal */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	575
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	576 /* Give up */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	577 PyErr_Format(PyExc_TypeError,
39697 ec48057a34b6 Get rid of most of the remaining uses of <>. There's still Tools/* thogh. Neal Norwitz <nnorwitz@gmail.com> parents: 39644 diff changeset	578 "unorderable types: '%.100s' != '%.100s'",
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	579 v->ob_type->tp_name,
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	580 w->ob_type->tp_name);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	581 return -1;
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	582 }
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	583
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	584 /* Perform a three-way comparison. This wraps do_compare() with a check for
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	585 NULL arguments and a recursion check. */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	586 int
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	587 PyObject_Compare(PyObject v, PyObject w)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	588 {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	589 int res;
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	590
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	591 if (v == NULL \|\| w == NULL) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	592 if (!PyErr_Occurred())
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	593 PyErr_BadInternalCall();
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	594 return -1;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	595 }
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	596 if (Py_EnterRecursiveCall(" in cmp"))
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	597 return -1;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	598 res = do_compare(v, w);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	599 Py_LeaveRecursiveCall();
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	600 return res < 0 ? -1 : res;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	601 }
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	602
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	603 /* Map rich comparison operators to their swapped version, e.g. LT <--> GT */
33571 a5682bc73e04 Remove 'extern' declaration for _Py_SwappedOp. Brett Cannon <bcannon@gmail.com> parents: 33541 diff changeset	604 int _Py_SwappedOp[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	605
40485 d4fcb5656316 The opstrings table was backwards. Add an XXX comment. Guido van Rossum <guido@python.org> parents: 40401 diff changeset	606 static char *opstrings[] = {"<", "<=", "==", "!=", ">", ">="};
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	607
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	608 /* Perform a rich comparison, raising TypeError when the requested comparison
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	609 operator is not supported. */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	610 static PyObject *
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	611 do_richcompare(PyObject v, PyObject w, int op)
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	612 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	613 richcmpfunc f;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	614 PyObject *res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	615
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20002 diff changeset	616 if (v->ob_type != w->ob_type &&
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20002 diff changeset	617 PyType_IsSubtype(w->ob_type, v->ob_type) &&
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	618 (f = w->ob_type->tp_richcompare) != NULL) {
33541 781aef974463 A static swapped_op[] array was defined in 3 different C files, & I think Tim Peters <tim.peters@gmail.com> parents: 33489 diff changeset	619 res = (*f)(w, v, _Py_SwappedOp[op]);
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20002 diff changeset	620 if (res != Py_NotImplemented)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20002 diff changeset	621 return res;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20002 diff changeset	622 Py_DECREF(res);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20002 diff changeset	623 }
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	624 if ((f = v->ob_type->tp_richcompare) != NULL) {
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	625 res = (*f)(v, w, op);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	626 if (res != Py_NotImplemented)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	627 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	628 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	629 }
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	630 if ((f = w->ob_type->tp_richcompare) != NULL) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	631 res = (*f)(w, v, _Py_SwappedOp[op]);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	632 if (res != Py_NotImplemented)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	633 return res;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	634 Py_DECREF(res);
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	635 }
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	636 /* If neither object implements it, provide a sensible default
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	637 for == and !=, but raise an exception for ordering. */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	638 switch (op) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	639 case Py_EQ:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	640 res = (v == w) ? Py_True : Py_False;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	641 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	642 case Py_NE:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	643 res = (v != w) ? Py_True : Py_False;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	644 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	645 default:
40485 d4fcb5656316 The opstrings table was backwards. Add an XXX comment. Guido van Rossum <guido@python.org> parents: 40401 diff changeset	646 /* XXX Special-case None so it doesn't show as NoneType() */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	647 PyErr_Format(PyExc_TypeError,
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	648 "unorderable types: %.100s() %s %.100s()",
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	649 v->ob_type->tp_name,
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	650 opstrings[op],
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	651 w->ob_type->tp_name);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	652 return NULL;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	653 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	654 Py_INCREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	655 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	656 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	657
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	658 /* Perform a rich comparison with object result. This wraps do_richcompare()
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	659 with a check for NULL arguments and a recursion check. */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	660
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	661 PyObject *
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	662 PyObject_RichCompare(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	663 {
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	664 PyObject *res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	665
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	666 assert(Py_LT <= op && op <= Py_GE);
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	667 if (v == NULL \|\| w == NULL) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	668 if (!PyErr_Occurred())
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	669 PyErr_BadInternalCall();
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	670 return NULL;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	671 }
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30159 diff changeset	672 if (Py_EnterRecursiveCall(" in cmp"))
c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30159 diff changeset	673 return NULL;
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	674 res = do_richcompare(v, w, op);
30801 c42c40034536 Deleting cyclic object comparison. Armin Rigo <arigo@tunes.org> parents: 30159 diff changeset	675 Py_LeaveRecursiveCall();
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	676 return res;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	677 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	678
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	679 /* Perform a rich comparison with integer result. This wraps
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	680 PyObject_RichCompare(), returning -1 for error, 0 for false, 1 for true. */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	681 int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	682 PyObject_RichCompareBool(PyObject v, PyObject w, int op)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	683 {
31736 6fcbf6ac699a Add identity shortcut to PyObject_RichCompareBool. Raymond Hettinger <python@rcn.com> parents: 31433 diff changeset	684 PyObject *res;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	685 int ok;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	686
31736 6fcbf6ac699a Add identity shortcut to PyObject_RichCompareBool. Raymond Hettinger <python@rcn.com> parents: 31433 diff changeset	687 res = PyObject_RichCompare(v, w, op);
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	688 if (res == NULL)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	689 return -1;
25013 68627e0acd15 Speedup for PyObject_RichCompareBool(): PyObject_RichCompare() almost Guido van Rossum <guido@python.org> parents: 24897 diff changeset	690 if (PyBool_Check(res))
68627e0acd15 Speedup for PyObject_RichCompareBool(): PyObject_RichCompare() almost Guido van Rossum <guido@python.org> parents: 24897 diff changeset	691 ok = (res == Py_True);
68627e0acd15 Speedup for PyObject_RichCompareBool(): PyObject_RichCompare() almost Guido van Rossum <guido@python.org> parents: 24897 diff changeset	692 else
68627e0acd15 Speedup for PyObject_RichCompareBool(): PyObject_RichCompare() almost Guido van Rossum <guido@python.org> parents: 24897 diff changeset	693 ok = PyObject_IsTrue(res);
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	694 Py_DECREF(res);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	695 return ok;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	696 }
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	697
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	698 /* Turn the result of a three-way comparison into the result expected by a
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	699 rich comparison. */
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	700 PyObject *
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	701 Py_CmpToRich(int op, int cmp)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	702 {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	703 PyObject *res;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	704 int ok;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	705
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	706 if (PyErr_Occurred())
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	707 return NULL;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	708 switch (op) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	709 case Py_LT:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	710 ok = cmp < 0;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	711 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	712 case Py_LE:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	713 ok = cmp <= 0;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	714 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	715 case Py_EQ:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	716 ok = cmp == 0;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	717 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	718 case Py_NE:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	719 ok = cmp != 0;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	720 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	721 case Py_GT:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	722 ok = cmp > 0;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	723 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	724 case Py_GE:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	725 ok = cmp >= 0;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	726 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	727 default:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	728 PyErr_BadArgument();
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	729 return NULL;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	730 }
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	731 res = ok ? Py_True : Py_False;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	732 Py_INCREF(res);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	733 return res;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	734 }
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	735
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	736 /* Set of hash utility functions to help maintaining the invariant that
31738 dba8db412e35 Fix typo in comment. Raymond Hettinger <python@rcn.com> parents: 31736 diff changeset	737 if a==b then hash(a)==hash(b)
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	738
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	739 All the utility functions (_Py_Hash*()) return "-1" to signify an error.
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	740 */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	741
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	742 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	743 _Py_HashDouble(double v)
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	744 {
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	745 double intpart, fractpart;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	746 int expo;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	747 long hipart;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	748 long x; /* the final hash value */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	749 /* This is designed so that Python numbers of different types
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	750 * that compare equal hash to the same value; otherwise comparisons
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	751 * of mapping keys will turn out weird.
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	752 */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	753
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	754 fractpart = modf(v, &intpart);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	755 if (fractpart == 0.0) {
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	756 /* This must return the same hash as an equal int or long. */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	757 if (intpart > LONG_MAX \|\| -intpart > LONG_MAX) {
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	758 /* Convert to long and use its hash. */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	759 PyObject plong; / converted to Python long */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	760 if (Py_IS_INFINITY(intpart))
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	761 /* can't convert to long int -- arbitrary */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	762 v = v < 0 ? -271828.0 : 314159.0;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	763 plong = PyLong_FromDouble(v);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	764 if (plong == NULL)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	765 return -1;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	766 x = PyObject_Hash(plong);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	767 Py_DECREF(plong);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	768 return x;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	769 }
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	770 /* Fits in a C long == a Python int, so is its own hash. */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	771 x = (long)intpart;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	772 if (x == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	773 x = -2;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	774 return x;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	775 }
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	776 /* The fractional part is non-zero, so we don't have to worry about
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	777 * making this match the hash of some other type.
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	778 * Use frexp to get at the bits in the double.
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	779 * Since the VAX D double format has 56 mantissa bits, which is the
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	780 * most of any double format in use, each of these parts may have as
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	781 * many as (but no more than) 56 significant bits.
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	782 * So, assuming sizeof(long) >= 4, each part can be broken into two
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	783 * longs; frexp and multiplication are used to do that.
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	784 * Also, since the Cray double format has 15 exponent bits, which is
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	785 * the most of any double format in use, shifting the exponent field
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	786 * left by 15 won't overflow a long (again assuming sizeof(long) >= 4).
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	787 */
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	788 v = frexp(v, &expo);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	789 v = 2147483648.0; / 2*31 /
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	790 hipart = (long)v; /* take the top 32 bits */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	791 v = (v - (double)hipart) * 2147483648.0; /* get the next 32 bits */
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	792 x = hipart + (long)v + (expo << 15);
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	793 if (x == -1)
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	794 x = -2;
5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13915 diff changeset	795 return x;
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	796 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	797
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	798 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	799 _Py_HashPointer(void *p)
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	800 {
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	801 #if SIZEOF_LONG >= SIZEOF_VOID_P
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	802 return (long)p;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	803 #else
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	804 /* convert to a Python long and hash that */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	805 PyObject* longobj;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	806 long x;
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	807
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	808 if ((longobj = PyLong_FromVoidPtr(p)) == NULL) {
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	809 x = -1;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	810 goto finally;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	811 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	812 x = PyObject_Hash(longobj);
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	813
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	814 finally:
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	815 Py_XDECREF(longobj);
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	816 return x;
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	817 #endif
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	818 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	819
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	820
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	821 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	822 PyObject_Hash(PyObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	823 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	824 PyTypeObject *tp = v->ob_type;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	825 if (tp->tp_hash != NULL)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	826 return (*tp->tp_hash)(v);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	827 /* Otherwise, the object can't be hashed */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	828 PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	829 v->ob_type->tp_name);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	830 return -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	831 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	832
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	833 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	834 PyObject_GetAttrString(PyObject v, const char name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	835 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	836 PyObject w, res;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	837
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	838 if (v->ob_type->tp_getattr != NULL)
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	839 return (v->ob_type->tp_getattr)(v, (char)name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	840 w = PyString_InternFromString(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	841 if (w == NULL)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	842 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	843 res = PyObject_GetAttr(v, w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	844 Py_XDECREF(w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	845 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	846 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	847
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	848 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	849 PyObject_HasAttrString(PyObject v, const char name)
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	850 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	851 PyObject *res = PyObject_GetAttrString(v, name);
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	852 if (res != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	853 Py_DECREF(res);
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	854 return 1;
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	855 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	856 PyErr_Clear();
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	857 return 0;
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	858 }
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	859
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	860 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	861 PyObject_SetAttrString(PyObject v, const char name, PyObject *w)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	862 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	863 PyObject *s;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	864 int res;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	865
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	866 if (v->ob_type->tp_setattr != NULL)
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	867 return (v->ob_type->tp_setattr)(v, (char)name, w);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	868 s = PyString_InternFromString(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	869 if (s == NULL)
95 a5bf7d5959ce Return -1 for errors. Guido van Rossum <guido@python.org> parents: 86 diff changeset	870 return -1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	871 res = PyObject_SetAttr(v, s, w);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	872 Py_XDECREF(s);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	873 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	874 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	875
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	876 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	877 PyObject_GetAttr(PyObject v, PyObject name)
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	878 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	879 PyTypeObject *tp = v->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	880
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	881 if (!PyString_Check(name)) {
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	882 /* The Unicode to string conversion is done here because the
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	883 existing tp_getattro slots expect a string object as name
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	884 and we wouldn't want to break those. */
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	885 if (PyUnicode_Check(name)) {
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	886 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	887 if (name == NULL)
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	888 return NULL;
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	889 }
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	890 else
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	891 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	892 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	893 "attribute name must be string, not '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	894 name->ob_type->tp_name);
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	895 return NULL;
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	896 }
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	897 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	898 if (tp->tp_getattro != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	899 return (*tp->tp_getattro)(v, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	900 if (tp->tp_getattr != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	901 return (*tp->tp_getattr)(v, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	902 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	903 "'%.50s' object has no attribute '%.400s'",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	904 tp->tp_name, PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	905 return NULL;
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	906 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	907
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	908 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	909 PyObject_HasAttr(PyObject v, PyObject name)
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	910 {
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	911 PyObject *res = PyObject_GetAttr(v, name);
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	912 if (res != NULL) {
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	913 Py_DECREF(res);
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	914 return 1;
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	915 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	916 PyErr_Clear();
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	917 return 0;
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	918 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	919
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	920 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	921 PyObject_SetAttr(PyObject v, PyObject name, PyObject *value)
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	922 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	923 PyTypeObject *tp = v->ob_type;
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	924 int err;
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	925
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	926 if (!PyString_Check(name)) {
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	927 /* The Unicode to string conversion is done here because the
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	928 existing tp_setattro slots expect a string object as name
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	929 and we wouldn't want to break those. */
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	930 if (PyUnicode_Check(name)) {
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	931 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	932 if (name == NULL)
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	933 return -1;
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	934 }
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	935 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	936 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	937 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	938 "attribute name must be string, not '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	939 name->ob_type->tp_name);
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	940 return -1;
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	941 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	942 }
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	943 Py_INCREF(name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	944
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	945 PyString_InternInPlace(&name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	946 if (tp->tp_setattro != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	947 err = (*tp->tp_setattro)(v, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	948 Py_DECREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	949 return err;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	950 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	951 if (tp->tp_setattr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	952 err = (*tp->tp_setattr)(v, PyString_AS_STRING(name), value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	953 Py_DECREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	954 return err;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	955 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	956 Py_DECREF(name);
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	957 assert(name->ob_refcnt >= 1);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	958 if (tp->tp_getattr == NULL && tp->tp_getattro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	959 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	960 "'%.100s' object has no attributes "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	961 "(%s .%.100s)",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	962 tp->tp_name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	963 value==NULL ? "del" : "assign to",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	964 PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	965 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	966 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	967 "'%.100s' object has only read-only attributes "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	968 "(%s .%.100s)",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	969 tp->tp_name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	970 value==NULL ? "del" : "assign to",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	971 PyString_AS_STRING(name));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	972 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	973 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	974
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	975 /* Helper to get a pointer to an object's __dict__ slot, if any */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	976
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	977 PyObject **
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	978 _PyObject_GetDictPtr(PyObject *obj)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	979 {
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36838 diff changeset	980 Py_ssize_t dictoffset;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	981 PyTypeObject *tp = obj->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	982
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	983 dictoffset = tp->tp_dictoffset;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	984 if (dictoffset == 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	985 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	986 if (dictoffset < 0) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	987 Py_ssize_t tsize;
22106 93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	988 size_t size;
93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	989
93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	990 tsize = ((PyVarObject *)obj)->ob_size;
93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	991 if (tsize < 0)
93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	992 tsize = -tsize;
93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	993 size = _PyObject_VAR_SIZE(tp, tsize);
93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	994
20294 426b379a138b _PyObject_VAR_SIZE: always round up to a multiple-of-pointer-size value. Tim Peters <tim.peters@gmail.com> parents: 20292 diff changeset	995 dictoffset += (long)size;
426b379a138b _PyObject_VAR_SIZE: always round up to a multiple-of-pointer-size value. Tim Peters <tim.peters@gmail.com> parents: 20292 diff changeset	996 assert(dictoffset > 0);
426b379a138b _PyObject_VAR_SIZE: always round up to a multiple-of-pointer-size value. Tim Peters <tim.peters@gmail.com> parents: 20292 diff changeset	997 assert(dictoffset % SIZEOF_VOID_P == 0);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	998 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	999 return (PyObject *) ((char )obj + dictoffset);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1000 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1001
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1002 PyObject *
28320 fd5ef7003469 Renamed PyObject_GenericGetIter to PyObject_SelfIter Raymond Hettinger <python@rcn.com> parents: 28308 diff changeset	1003 PyObject_SelfIter(PyObject *obj)
28308 9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1004 {
9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1005 Py_INCREF(obj);
9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1006 return obj;
9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1007 }
9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1008
33489 4cb1016525b7 Move a comment back to its rightful location. Michael W. Hudson <mwh@python.net> parents: 32981 diff changeset	1009 /* Generic GetAttr functions - put these in your tp_[gs]etattro slot */
4cb1016525b7 Move a comment back to its rightful location. Michael W. Hudson <mwh@python.net> parents: 32981 diff changeset	1010
28308 9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1011 PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1012 PyObject_GenericGetAttr(PyObject obj, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1013 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1014 PyTypeObject *tp = obj->ob_type;
24897 6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1015 PyObject *descr = NULL;
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1016 PyObject *res = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1017 descrgetfunc f;
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36838 diff changeset	1018 Py_ssize_t dictoffset;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1019 PyObject **dictptr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1020
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1021 if (!PyString_Check(name)){
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1022 /* The Unicode to string conversion is done here because the
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1023 existing tp_setattro slots expect a string object as name
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1024 and we wouldn't want to break those. */
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1025 if (PyUnicode_Check(name)) {
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1026 name = PyUnicode_AsEncodedString(name, NULL, NULL);
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1027 if (name == NULL)
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1028 return NULL;
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1029 }
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1030 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1031 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1032 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1033 "attribute name must be string, not '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1034 name->ob_type->tp_name);
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1035 return NULL;
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1036 }
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1037 }
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1038 else
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1039 Py_INCREF(name);
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1040
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1041 if (tp->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1042 if (PyType_Ready(tp) < 0)
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1043 goto done;
12991 1a40f00a48bf raise TypeError when PyObject_Get/SetAttr called with non-string name Jeremy Hylton <jeremy@alum.mit.edu> parents: 12904 diff changeset	1044 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1045
24897 6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1046 /* Inline _PyType_Lookup */
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1047 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1048 Py_ssize_t i, n;
24897 6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1049 PyObject mro, base, *dict;
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1050
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1051 /* Look in tp_dict of types in MRO */
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1052 mro = tp->tp_mro;
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1053 assert(mro != NULL);
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1054 assert(PyTuple_Check(mro));
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1055 n = PyTuple_GET_SIZE(mro);
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1056 for (i = 0; i < n; i++) {
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1057 base = PyTuple_GET_ITEM(mro, i);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1058 assert(PyType_Check(base));
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1059 dict = ((PyTypeObject *)base)->tp_dict;
24897 6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1060 assert(dict && PyDict_Check(dict));
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1061 descr = PyDict_GetItem(dict, name);
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1062 if (descr != NULL)
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1063 break;
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1064 }
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1065 }
6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1066
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1067 Py_XINCREF(descr);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1068
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1069 f = NULL;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	1070 if (descr != NULL) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1071 f = descr->ob_type->tp_descr_get;
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1072 if (f != NULL && PyDescr_IsData(descr)) {
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1073 res = f(descr, obj, (PyObject *)obj->ob_type);
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1074 Py_DECREF(descr);
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1075 goto done;
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1076 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1077 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1078
24894 8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1079 /* Inline _PyObject_GetDictPtr */
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1080 dictoffset = tp->tp_dictoffset;
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1081 if (dictoffset != 0) {
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1082 PyObject *dict;
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1083 if (dictoffset < 0) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1084 Py_ssize_t tsize;
24894 8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1085 size_t size;
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1086
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1087 tsize = ((PyVarObject *)obj)->ob_size;
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1088 if (tsize < 0)
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1089 tsize = -tsize;
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1090 size = _PyObject_VAR_SIZE(tp, tsize);
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1091
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1092 dictoffset += (long)size;
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1093 assert(dictoffset > 0);
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1094 assert(dictoffset % SIZEOF_VOID_P == 0);
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1095 }
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1096 dictptr = (PyObject *) ((char )obj + dictoffset);
8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1097 dict = *dictptr;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1098 if (dict != NULL) {
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1099 res = PyDict_GetItem(dict, name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1100 if (res != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1101 Py_INCREF(res);
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1102 Py_XDECREF(descr);
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1103 goto done;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1104 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1105 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1106 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1107
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1108 if (f != NULL) {
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1109 res = f(descr, obj, (PyObject *)obj->ob_type);
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1110 Py_DECREF(descr);
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1111 goto done;
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1112 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1113
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1114 if (descr != NULL) {
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1115 res = descr;
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1116 /* descr was already increfed above */
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1117 goto done;
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1118 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1119
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1120 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1121 "'%.50s' object has no attribute '%.400s'",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1122 tp->tp_name, PyString_AS_STRING(name));
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1123 done:
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1124 Py_DECREF(name);
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1125 return res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1126 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1127
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1128 int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1129 PyObject_GenericSetAttr(PyObject obj, PyObject name, PyObject *value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1130 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1131 PyTypeObject *tp = obj->ob_type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1132 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1133 descrsetfunc f;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1134 PyObject **dictptr;
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1135 int res = -1;
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1136
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1137 if (!PyString_Check(name)){
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1138 /* The Unicode to string conversion is done here because the
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1139 existing tp_setattro slots expect a string object as name
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1140 and we wouldn't want to break those. */
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1141 if (PyUnicode_Check(name)) {
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1142 name = PyUnicode_AsEncodedString(name, NULL, NULL);
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1143 if (name == NULL)
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1144 return -1;
a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1145 }
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1146 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1147 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1148 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1149 "attribute name must be string, not '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1150 name->ob_type->tp_name);
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1151 return -1;
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1152 }
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1153 }
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1154 else
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1155 Py_INCREF(name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1156
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1157 if (tp->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1158 if (PyType_Ready(tp) < 0)
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1159 goto done;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1160 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1161
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1162 descr = _PyType_Lookup(tp, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1163 f = NULL;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	1164 if (descr != NULL) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1165 f = descr->ob_type->tp_descr_set;
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1166 if (f != NULL && PyDescr_IsData(descr)) {
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1167 res = f(descr, obj, value);
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1168 goto done;
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1169 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1170 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1171
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1172 dictptr = _PyObject_GetDictPtr(obj);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1173 if (dictptr != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1174 PyObject dict = dictptr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1175 if (dict == NULL && value != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1176 dict = PyDict_New();
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1177 if (dict == NULL)
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1178 goto done;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1179 *dictptr = dict;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1180 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1181 if (dict != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1182 if (value == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1183 res = PyDict_DelItem(dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1184 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1185 res = PyDict_SetItem(dict, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1186 if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1187 PyErr_SetObject(PyExc_AttributeError, name);
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1188 goto done;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1189 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1190 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1191
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1192 if (f != NULL) {
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1193 res = f(descr, obj, value);
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1194 goto done;
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1195 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1196
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1197 if (descr == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1198 PyErr_Format(PyExc_AttributeError,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1199 "'%.100s' object has no attribute '%.200s'",
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1200 tp->tp_name, PyString_AS_STRING(name));
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1201 goto done;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1202 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1203
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1204 PyErr_Format(PyExc_AttributeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1205 "'%.50s' object attribute '%.400s' is read-only",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1206 tp->tp_name, PyString_AS_STRING(name));
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1207 done:
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1208 Py_DECREF(name);
0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1209 return res;
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1210 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1211
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1212 /* Test a value used as condition, e.g., in a for or if statement.
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1213 Return -1 if an error occurred */
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1214
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1215 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1216 PyObject_IsTrue(PyObject *v)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1217 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1218 Py_ssize_t res;
25015 24e80d96bd0b Speedup for PyObject_IsTrue(): check for True and False first. Guido van Rossum <guido@python.org> parents: 25013 diff changeset	1219 if (v == Py_True)
24e80d96bd0b Speedup for PyObject_IsTrue(): check for True and False first. Guido van Rossum <guido@python.org> parents: 25013 diff changeset	1220 return 1;
24e80d96bd0b Speedup for PyObject_IsTrue(): check for True and False first. Guido van Rossum <guido@python.org> parents: 25013 diff changeset	1221 if (v == Py_False)
24e80d96bd0b Speedup for PyObject_IsTrue(): check for True and False first. Guido van Rossum <guido@python.org> parents: 25013 diff changeset	1222 return 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1223 if (v == Py_None)
23838 95263ccec819 SF # 561244 Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 23599 diff changeset	1224 return 0;
8404 64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1225 else if (v->ob_type->tp_as_number != NULL &&
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39703 diff changeset	1226 v->ob_type->tp_as_number->nb_bool != NULL)
88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39703 diff changeset	1227 res = (*v->ob_type->tp_as_number->nb_bool)(v);
8404 64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1228 else if (v->ob_type->tp_as_mapping != NULL &&
64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1229 v->ob_type->tp_as_mapping->mp_length != NULL)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1230 res = (*v->ob_type->tp_as_mapping->mp_length)(v);
8404 64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1231 else if (v->ob_type->tp_as_sequence != NULL &&
64b88a178328 In PyObject_IsTrue(), don't call function pointers that are NULL Guido van Rossum <guido@python.org> parents: 8181 diff changeset	1232 v->ob_type->tp_as_sequence->sq_length != NULL)
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1233 res = (*v->ob_type->tp_as_sequence->sq_length)(v);
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1234 else
23838 95263ccec819 SF # 561244 Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 23599 diff changeset	1235 return 1;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1236 /* if it is negative, it should be either -1 or -2 */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1237 return (res > 0) ? 1 : Py_SAFE_DOWNCAST(res, Py_ssize_t, int);
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1238 }
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1239
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1240 /* equivalent of 'not v'
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1241 Return -1 if an error occurred */
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1242
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1243 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1244 PyObject_Not(PyObject *v)
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1245 {
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1246 int res;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1247 res = PyObject_IsTrue(v);
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1248 if (res < 0)
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1249 return res;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1250 return res == 0;
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1251 }
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1252
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1253 /* Test whether an object can be called */
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1254
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1255 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1256 PyCallable_Check(PyObject *x)
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1257 {
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1258 if (x == NULL)
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1259 return 0;
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1260 return x->ob_type->tp_call != NULL;
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1261 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1262
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1263 /* ------------------------- PyObject_Dir() helpers ------------------------- */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1264
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1265 /* Helper for PyObject_Dir.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1266 Merge the __dict__ of aclass into dict, and recursively also all
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1267 the __dict__s of aclass's base classes. The order of merging isn't
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1268 defined, as it's expected that only the final set of dict keys is
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1269 interesting.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1270 Return 0 on success, -1 on error.
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1271 */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1272
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1273 static int
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1274 merge_class_dict(PyObject* dict, PyObject* aclass)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1275 {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1276 PyObject *classdict;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1277 PyObject *bases;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1278
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1279 assert(PyDict_Check(dict));
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1280 assert(aclass);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1281
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1282 /* Merge in the type's dict (if any). */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1283 classdict = PyObject_GetAttrString(aclass, "__dict__");
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1284 if (classdict == NULL)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1285 PyErr_Clear();
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1286 else {
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1287 int status = PyDict_Update(dict, classdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1288 Py_DECREF(classdict);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1289 if (status < 0)
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1290 return -1;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1291 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1292
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1293 /* Recursively merge in the base types' (if any) dicts. */
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1294 bases = PyObject_GetAttrString(aclass, "__bases__");
19931 c327a8ac9f2b merge_class_dict(): Clear the error if __bases__ doesn't exist. Tim Peters <tim.peters@gmail.com> parents: 19906 diff changeset	1295 if (bases == NULL)
c327a8ac9f2b merge_class_dict(): Clear the error if __bases__ doesn't exist. Tim Peters <tim.peters@gmail.com> parents: 19906 diff changeset	1296 PyErr_Clear();
c327a8ac9f2b merge_class_dict(): Clear the error if __bases__ doesn't exist. Tim Peters <tim.peters@gmail.com> parents: 19906 diff changeset	1297 else {
23436 f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1298 /* We have no guarantee that bases is a real tuple */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1299 Py_ssize_t i, n;
23436 f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1300 n = PySequence_Size(bases); /* This better be right */
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1301 if (n < 0)
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1302 PyErr_Clear();
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1303 else {
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1304 for (i = 0; i < n; i++) {
27702 84f2c438c3f5 SF bug 681122: Built-in function dir() causes refcount leak in baseclasses. Tim Peters <tim.peters@gmail.com> parents: 27314 diff changeset	1305 int status;
23436 f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1306 PyObject *base = PySequence_GetItem(bases, i);
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1307 if (base == NULL) {
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1308 Py_DECREF(bases);
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1309 return -1;
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1310 }
27702 84f2c438c3f5 SF bug 681122: Built-in function dir() causes refcount leak in baseclasses. Tim Peters <tim.peters@gmail.com> parents: 27314 diff changeset	1311 status = merge_class_dict(dict, base);
84f2c438c3f5 SF bug 681122: Built-in function dir() causes refcount leak in baseclasses. Tim Peters <tim.peters@gmail.com> parents: 27314 diff changeset	1312 Py_DECREF(base);
84f2c438c3f5 SF bug 681122: Built-in function dir() causes refcount leak in baseclasses. Tim Peters <tim.peters@gmail.com> parents: 27314 diff changeset	1313 if (status < 0) {
23436 f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1314 Py_DECREF(bases);
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1315 return -1;
f9d5e1fb2aa6 Jim Fulton reported a segfault in dir(). A heavily proxied object Guido van Rossum <guido@python.org> parents: 23282 diff changeset	1316 }
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1317 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1318 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1319 Py_DECREF(bases);
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1320 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1321 return 0;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1322 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1323
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1324 /* Helper for PyObject_Dir without arguments: returns the local scope. */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1325 static PyObject *
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41124 diff changeset	1326 _dir_locals(void)
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1327 {
41124 211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1328 PyObject *names;
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1329 PyObject *locals = PyEval_GetLocals();
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1330
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1331 if (locals == NULL) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1332 PyErr_SetString(PyExc_SystemError, "frame does not exist");
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1333 return NULL;
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1334 }
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1335
41124 211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1336 names = PyMapping_Keys(locals);
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1337 if (!names)
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1338 return NULL;
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1339 if (!PyList_Check(names)) {
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1340 PyErr_Format(PyExc_TypeError,
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1341 "dir(): expected keys() of locals to be a list, "
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1342 "not '%.200s'", names->ob_type->tp_name);
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1343 Py_DECREF(names);
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1344 return NULL;
211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1345 }
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1346 /* the locals don't need to be DECREF'd */
41124 211201e6b045 Check the keys of the locals dict -- they need not be a list. Georg Brandl <georg@python.org> parents: 41107 diff changeset	1347 return names;
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1348 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1349
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1350 /* Helper for PyObject_Dir of type objects: returns __dict__ and __bases__.
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1351 We deliberately don't suck up its __class__, as methods belonging to the
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1352 metaclass would probably be more confusing than helpful.
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1353 */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1354 static PyObject *
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1355 _specialized_dir_type(PyObject *obj)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1356 {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1357 PyObject *result = NULL;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1358 PyObject *dict = PyDict_New();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1359
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1360 if (dict != NULL && merge_class_dict(dict, obj) == 0)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1361 result = PyDict_Keys(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1362
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1363 Py_XDECREF(dict);
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1364 return result;
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1365 }
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1366
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1367 /* Helper for PyObject_Dir of module objects: returns the module's __dict__. */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1368 static PyObject *
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1369 _specialized_dir_module(PyObject *obj)
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1370 {
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1371 PyObject *result = NULL;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1372 PyObject *dict = PyObject_GetAttrString(obj, "__dict__");
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1373
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1374 if (dict != NULL) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1375 if (PyDict_Check(dict))
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1376 result = PyDict_Keys(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1377 else {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1378 PyErr_Format(PyExc_TypeError,
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1379 "%.200s.__dict__ is not a dictionary",
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1380 PyModule_GetName(obj));
19833 f44606b242c5 PyObject_Dir(): Guido van Rossum <guido@python.org> parents: 19705 diff changeset	1381 }
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1382 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1383
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1384 Py_XDECREF(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1385 return result;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1386 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1387
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1388 /* Helper for PyObject_Dir of generic objects: returns __dict__, __class__,
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1389 and recursively up the __class__.__bases__ chain.
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1390 */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1391 static PyObject *
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1392 _generic_dir(PyObject *obj)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1393 {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1394 PyObject *result = NULL;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1395 PyObject *dict = NULL;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1396 PyObject *itsclass = NULL;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1397
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1398 /* Get __dict__ (which may or may not be a real dict...) */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1399 dict = PyObject_GetAttrString(obj, "__dict__");
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1400 if (dict == NULL) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1401 PyErr_Clear();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1402 dict = PyDict_New();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1403 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1404 else if (!PyDict_Check(dict)) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1405 Py_DECREF(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1406 dict = PyDict_New();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1407 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1408 else {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1409 /* Copy __dict__ to avoid mutating it. */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1410 PyObject *temp = PyDict_Copy(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1411 Py_DECREF(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1412 dict = temp;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1413 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1414
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1415 if (dict == NULL)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1416 goto error;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1417
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1418 /* Merge in attrs reachable from its class. */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1419 itsclass = PyObject_GetAttrString(obj, "__class__");
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1420 if (itsclass == NULL)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1421 /* XXX(tomer): Perhaps fall back to obj->ob_type if no
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1422 __class__ exists? */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1423 PyErr_Clear();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1424 else {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1425 if (merge_class_dict(dict, itsclass) != 0)
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1426 goto error;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1427 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1428
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1429 result = PyDict_Keys(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1430 /* fall through */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1431 error:
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1432 Py_XDECREF(itsclass);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1433 Py_XDECREF(dict);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1434 return result;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1435 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1436
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1437 /* Helper for PyObject_Dir: object introspection.
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1438 This calls one of the above specialized versions if no __dir__ method
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1439 exists. */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1440 static PyObject *
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1441 _dir_object(PyObject *obj)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1442 {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1443 PyObject * result = NULL;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1444 PyObject * dirfunc = PyObject_GetAttrString((PyObject*)obj->ob_type,
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1445 "__dir__");
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1446
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1447 assert(obj);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1448 if (dirfunc == NULL) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1449 /* use default implementation */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1450 PyErr_Clear();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1451 if (PyModule_Check(obj))
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1452 result = _specialized_dir_module(obj);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1453 else if (PyType_Check(obj))
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1454 result = _specialized_dir_type(obj);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1455 else
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1456 result = _generic_dir(obj);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1457 }
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1458 else {
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1459 /* use __dir__ */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1460 result = PyObject_CallFunctionObjArgs(dirfunc, obj, NULL);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1461 Py_DECREF(dirfunc);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1462 if (result == NULL)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1463 return NULL;
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1464
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1465 /* result must be a list */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1466 /* XXX(gbrandl): could also check if all items are strings */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1467 if (!PyList_Check(result)) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1468 PyErr_Format(PyExc_TypeError,
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1469 "__dir__() must return a list, not %.200s",
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1470 result->ob_type->tp_name);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1471 Py_DECREF(result);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1472 result = NULL;
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1473 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1474 }
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1475
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1476 return result;
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1477 }
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1478
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1479 /* Implementation of dir() -- if obj is NULL, returns the names in the current
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1480 (local) scope. Otherwise, performs introspection of the object: returns a
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1481 sorted list of attribute names (supposedly) accessible from the object
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1482 */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1483 PyObject *
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1484 PyObject_Dir(PyObject *obj)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1485 {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1486 PyObject * result;
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1487
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1488 if (obj == NULL)
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1489 /* no object -- introspect the locals */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1490 result = _dir_locals();
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1491 else
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1492 /* object -- introspect the object */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1493 result = _dir_object(obj);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1494
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1495 assert(result == NULL \|\| PyList_Check(result));
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1496
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1497 if (result != NULL && PyList_Sort(result) != 0) {
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1498 /* sorting the list failed */
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1499 Py_DECREF(result);
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1500 result = NULL;
32981 50c122bc7aac SF bug #1004669: Type returned from .keys() is not checked Raymond Hettinger <python@rcn.com> parents: 32531 diff changeset	1501 }
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1502
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1503 return result;
b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	1504 }
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1505
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1506 /*
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1507 NoObject is usable as a non-NULL undefined value, used by the macro None.
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1508 There is (and should be!) no way to create other objects of this type,
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1509 so there is exactly one (which is indestructible, by the way).
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1510 (XXX This type and the type of NotImplemented below should be unified.)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1511 */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1512
739 ab1b3486b226 Fix lint bug Guido van Rossum <guido@python.org> parents: 512 diff changeset	1513 /* ARGSUSED */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1514 static PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1515 none_repr(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1516 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1517 return PyString_FromString("None");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1518 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1519
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1520 /* ARGUSED */
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1521 static void
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1522 none_dealloc(PyObject* ignore)
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1523 {
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1524 /* This should never get called, but we also don't want to SEGV if
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1525 * we accidently decref None out of existance.
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1526 */
24644 7ba3e5fbaad8 Replace abort with Py_FatalError. Martin v. Löwis <martin@v.loewis.de> parents: 24420 diff changeset	1527 Py_FatalError("deallocating None");
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1528 }
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1529
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1530
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1531 static PyTypeObject PyNone_Type = {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1532 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1533 0,
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1534 "NoneType",
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1535 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1536 0,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1537 none_dealloc, /tp_dealloc/ /never called/
1051 f54e64c8b9b7 * Makefile: added IMGFILE; moved some stuff around. Guido van Rossum <guido@python.org> parents: 1017 diff changeset	1538 0, /tp_print/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1539 0, /tp_getattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1540 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1541 0, /tp_compare/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1542 none_repr, /tp_repr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1543 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1544 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1545 0, /tp_as_mapping/
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1546 0, /tp_hash /
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1547 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1548
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1549 PyObject _Py_NoneStruct = {
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1550 PyObject_HEAD_INIT(&PyNone_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1551 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1552
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1553 /* NotImplemented is an object that can be used to signal that an
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1554 operation is not implemented for the given type combination. */
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1555
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1556 static PyObject *
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1557 NotImplemented_repr(PyObject *op)
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1558 {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1559 return PyString_FromString("NotImplemented");
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1560 }
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1561
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1562 static PyTypeObject PyNotImplemented_Type = {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1563 PyObject_HEAD_INIT(&PyType_Type)
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1564 0,
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1565 "NotImplementedType",
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1566 0,
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1567 0,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1568 none_dealloc, /tp_dealloc/ /never called/
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1569 0, /tp_print/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1570 0, /tp_getattr/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1571 0, /tp_setattr/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1572 0, /tp_compare/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1573 NotImplemented_repr, /tp_repr/
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1574 0, /tp_as_number/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1575 0, /tp_as_sequence/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1576 0, /tp_as_mapping/
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1577 0, /tp_hash /
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1578 };
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1579
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1580 PyObject _Py_NotImplementedStruct = {
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1581 PyObject_HEAD_INIT(&PyNotImplemented_Type)
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1582 };
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1583
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1584 void
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1585 _Py_ReadyTypes(void)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1586 {
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1587 if (PyType_Ready(&PyType_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1588 Py_FatalError("Can't initialize 'type'");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1589
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32463 diff changeset	1590 if (PyType_Ready(&_PyWeakref_RefType) < 0)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32463 diff changeset	1591 Py_FatalError("Can't initialize 'weakref'");
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32463 diff changeset	1592
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22649 diff changeset	1593 if (PyType_Ready(&PyBool_Type) < 0)
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22649 diff changeset	1594 Py_FatalError("Can't initialize 'bool'");
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22649 diff changeset	1595
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: 37879 diff changeset	1596 if (PyType_Ready(&PyBytes_Type) < 0)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: 37879 diff changeset	1597 Py_FatalError("Can't initialize 'bytes'");
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: 37879 diff changeset	1598
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23436 diff changeset	1599 if (PyType_Ready(&PyString_Type) < 0)
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23436 diff changeset	1600 Py_FatalError("Can't initialize 'str'");
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23436 diff changeset	1601
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1602 if (PyType_Ready(&PyList_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1603 Py_FatalError("Can't initialize 'list'");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1604
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1605 if (PyType_Ready(&PyNone_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1606 Py_FatalError("Can't initialize type(None)");
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1607
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1608 if (PyType_Ready(Py_Ellipsis->ob_type) < 0)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1609 Py_FatalError("Can't initialize type(Ellipsis)");
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1610
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1611 if (PyType_Ready(&PyNotImplemented_Type) < 0)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1612 Py_FatalError("Can't initialize type(NotImplemented)");
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	1613
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	1614 if (PyType_Ready(&PyCode_Type) < 0)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39623 diff changeset	1615 Py_FatalError("Can't initialize 'code'");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1616 }
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	1617
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1618
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1619 #ifdef Py_TRACE_REFS
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1620
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1621 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1622 _Py_NewReference(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1623 {
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24155 diff changeset	1624 _Py_INC_REFTOTAL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1625 op->ob_refcnt = 1;
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	1626 _Py_AddToAllObjects(op, 1);
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24155 diff changeset	1627 _Py_INC_TPALLOCS(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1628 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1629
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1630 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1631 _Py_ForgetReference(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1632 {
11673 5e6e9e893acd The rest of the changes by Trent Mick and Dale Nagata for warning-free Guido van Rossum <guido@python.org> parents: 11649 diff changeset	1633 #ifdef SLOW_UNREF_CHECK
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	1634 register PyObject *p;
11673 5e6e9e893acd The rest of the changes by Trent Mick and Dale Nagata for warning-free Guido van Rossum <guido@python.org> parents: 11649 diff changeset	1635 #endif
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	1636 if (op->ob_refcnt < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1637 Py_FatalError("UNREF negative refcnt");
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1638 if (op == &refchain \|\|
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	1639 op->_ob_prev->_ob_next != op \|\| op->_ob_next->_ob_prev != op)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1640 Py_FatalError("UNREF invalid object");
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1641 #ifdef SLOW_UNREF_CHECK
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1642 for (p = refchain._ob_next; p != &refchain; p = p->_ob_next) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1643 if (p == op)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1644 break;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1645 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1869 diff changeset	1646 if (p == &refchain) /* Not found */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1647 Py_FatalError("UNREF unknown object");
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1648 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1649 op->_ob_next->_ob_prev = op->_ob_prev;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1650 op->_ob_prev->_ob_next = op->_ob_next;
1017 cb7ef9bd9ede If a type has a repr function but no print function, printing it now Guido van Rossum <guido@python.org> parents: 795 diff changeset	1651 op->_ob_next = op->_ob_prev = NULL;
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 24155 diff changeset	1652 _Py_INC_TPFREES(op);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1653 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1654
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1655 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1656 _Py_Dealloc(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1657 {
1869 2cede61e9b1b rearranged code in debugging version of DELREF to avoid touching data Guido van Rossum <guido@python.org> parents: 1848 diff changeset	1658 destructor dealloc = op->ob_type->tp_dealloc;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1659 _Py_ForgetReference(op);
1869 2cede61e9b1b rearranged code in debugging version of DELREF to avoid touching data Guido van Rossum <guido@python.org> parents: 1848 diff changeset	1660 (*dealloc)(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1661 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1662
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1663 /* Print all live objects. Because PyObject_Print is called, the
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1664 * interpreter must be in a healthy state.
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1665 */
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	1666 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1667 _Py_PrintReferences(FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1668 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1669 PyObject *op;
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1670 fprintf(fp, "Remaining objects:\n");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1671 for (op = refchain._ob_next; op != &refchain; op = op->_ob_next) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1672 fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] ", op, op->ob_refcnt);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1673 if (PyObject_Print(op, fp, 0) != 0)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1674 PyErr_Clear();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1675 putc('\n', fp);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1676 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1677 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1678
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1679 /* Print the addresses of all live objects. Unlike _Py_PrintReferences, this
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1680 * doesn't make any calls to the Python C API, so is always safe to call.
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1681 */
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1682 void
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1683 _Py_PrintReferenceAddresses(FILE *fp)
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1684 {
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1685 PyObject *op;
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1686 fprintf(fp, "Remaining object addresses:\n");
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1687 for (op = refchain._ob_next; op != &refchain; op = op->_ob_next)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1688 fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] %s\n", op,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1689 op->ob_refcnt, op->ob_type->tp_name);
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1690 }
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	1691
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1692 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1693 _Py_GetObjects(PyObject self, PyObject args)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1694 {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1695 int i, n;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1696 PyObject *t = NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1697 PyObject res, op;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1698
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1699 if (!PyArg_ParseTuple(args, "i\|O", &n, &t))
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1700 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1701 op = refchain._ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1702 res = PyList_New(0);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1703 if (res == NULL)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1704 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1705 for (i = 0; (n == 0 \|\| i < n) && op != &refchain; i++) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1706 while (op == self \|\| op == args \|\| op == res \|\| op == t \|\|
18600 859505224850 _Py_GetObjects(): GCC suggests to add () around && within \|\| for some Guido van Rossum <guido@python.org> parents: 18063 diff changeset	1707 (t != NULL && op->ob_type != (PyTypeObject *) t)) {
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1708 op = op->_ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1709 if (op == &refchain)
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1710 return res;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1711 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1712 if (PyList_Append(res, op) < 0) {
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1713 Py_DECREF(res);
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1714 return NULL;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1715 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1716 op = op->_ob_next;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1717 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1718 return res;
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1719 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	1720
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1721 #endif
3330 9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1722
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1723
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	1724 /* Hack to force loading of cobject.o */
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1725 PyTypeObject *_Py_cobject_hack = &PyCObject_Type;
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1726
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1727
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	1728 /* Hack to force loading of abstract.o */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1729 Py_ssize_t (_Py_abstract_hack)(PyObject ) = PyObject_Size;
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1730
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1731
14006 ed369f0aa32b Updated comment Andrew M. Kuchling <amk@amk.ca> parents: 13976 diff changeset	1732 /* Python's malloc wrappers (see pymem.h) */
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1733
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1734 void *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1735 PyMem_Malloc(size_t nbytes)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1736 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1737 return PyMem_MALLOC(nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1738 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1739
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1740 void *
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1741 PyMem_Realloc(void *p, size_t nbytes)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1742 {
22985 d9d82c1ef864 First stab at rationalizing the PyMem_ API. Mixing PyObject_xyz with Tim Peters <tim.peters@gmail.com> parents: 22982 diff changeset	1743 return PyMem_REALLOC(p, nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1744 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1745
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1746 void
13709 4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1747 PyMem_Free(void *p)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1748 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1749 PyMem_FREE(p);
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1750 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1751
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	1752
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1753 /* These methods are used to control infinite recursion in repr, str, print,
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1754 etc. Container objects that may recursively contain themselves,
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1755 e.g. builtin dictionaries and lists, should used Py_ReprEnter() and
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1756 Py_ReprLeave() to avoid infinite recursion.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1757
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1758 Py_ReprEnter() returns 0 the first time it is called for a particular
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1759 object and 1 every time thereafter. It returns -1 if an exception
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1760 occurred. Py_ReprLeave() has no return value.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1761
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1762 See dictobject.c and listobject.c for examples of use.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1763 */
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1764
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1765 #define KEY "Py_Repr"
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1766
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1767 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1768 Py_ReprEnter(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1769 {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1770 PyObject *dict;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1771 PyObject *list;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1772 Py_ssize_t i;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1773
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1774 dict = PyThreadState_GetDict();
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1775 if (dict == NULL)
28616 4f0b7acffc7d - pythunrun.c, Py_Finalize(): move the call to _Py_PrintReferences() Guido van Rossum <guido@python.org> parents: 28397 diff changeset	1776 return 0;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1777 list = PyDict_GetItemString(dict, KEY);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1778 if (list == NULL) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1779 list = PyList_New(0);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1780 if (list == NULL)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1781 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1782 if (PyDict_SetItemString(dict, KEY, list) < 0)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1783 return -1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1784 Py_DECREF(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1785 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1786 i = PyList_GET_SIZE(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1787 while (--i >= 0) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1788 if (PyList_GET_ITEM(list, i) == obj)
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1789 return 1;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1790 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1791 PyList_Append(list, obj);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1792 return 0;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1793 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1794
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1795 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1796 Py_ReprLeave(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1797 {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1798 PyObject *dict;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1799 PyObject *list;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1800 Py_ssize_t i;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1801
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1802 dict = PyThreadState_GetDict();
8006 a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1803 if (dict == NULL)
a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1804 return;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1805 list = PyDict_GetItemString(dict, KEY);
8006 a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1806 if (list == NULL \|\| !PyList_Check(list))
a842c9e63280 Some robustness checks in Py_ReprLeave() in the unlikely event someone Guido van Rossum <guido@python.org> parents: 7984 diff changeset	1807 return;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1808 i = PyList_GET_SIZE(list);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1809 /* Count backwards because we always expect obj to be list[-1] */
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1810 while (--i >= 0) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1811 if (PyList_GET_ITEM(list, i) == obj) {
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1812 PyList_SetSlice(list, i, i + 1, NULL);
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1813 break;
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1814 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1815 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	1816 }
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1817
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1818 /* Trashcan support. */
12052 5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	1819
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1820 /* Current call-stack depth of tp_dealloc calls. */
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1821 int _PyTrash_delete_nesting = 0;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1822
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1823 /* List of objects that still need to be cleaned up, singly linked via their
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1824 * gc headers' gc_prev pointers.
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1825 */
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1826 PyObject *_PyTrash_delete_later = NULL;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1827
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1828 /* Add op to the _PyTrash_delete_later list. Called when the current
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1829 * call-stack depth gets large. op must be a currently untracked gc'ed
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1830 * object, with refcount 0. Py_DECREF must already have been called on it.
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1831 */
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1832 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1833 _PyTrash_deposit_object(PyObject *op)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1834 {
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1835 assert(PyObject_IS_GC(op));
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1836 assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1837 assert(op->ob_refcnt == 0);
22649 1616bd8b31bc If the GC is enabled then don't use the ob_type pointer to create a list Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22469 diff changeset	1838 _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *)_PyTrash_delete_later;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	1839 _PyTrash_delete_later = op;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1840 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1841
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1842 /* Dealloccate all the objects in the _PyTrash_delete_later list. Called when
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1843 * the call-stack unwinds again.
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1844 */
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1845 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1846 _PyTrash_destroy_chain(void)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1847 {
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1848 while (_PyTrash_delete_later) {
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1849 PyObject *op = _PyTrash_delete_later;
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1850 destructor dealloc = op->ob_type->tp_dealloc;
22649 1616bd8b31bc If the GC is enabled then don't use the ob_type pointer to create a list Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22469 diff changeset	1851
1616bd8b31bc If the GC is enabled then don't use the ob_type pointer to create a list Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22469 diff changeset	1852 _PyTrash_delete_later =
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1853 (PyObject*) _Py_AS_GC(op)->gc.gc_prev;
22649 1616bd8b31bc If the GC is enabled then don't use the ob_type pointer to create a list Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22469 diff changeset	1854
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1855 /* Call the deallocator directly. This used to try to
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1856 * fool Py_DECREF into calling it indirectly, but
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1857 * Py_DECREF was already called on this object, and in
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1858 * assorted non-release builds calling Py_DECREF again ends
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1859 * up distorting allocation statistics.
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1860 */
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1861 assert(op->ob_refcnt == 0);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1862 ++_PyTrash_delete_nesting;
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1863 (*dealloc)(op);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1864 --_PyTrash_delete_nesting;
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1865 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1866 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1867
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1868 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1869 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36977 diff changeset	1870 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/object.c @ 41601:b39abcbbbbba