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

annotate Objects/object.c @ 79675:c0a2294de787 2.7

Issue #16199: Backport 2to3 typo fix from 3.2.

author	Chris Jerdonek <chris.jerdonek@gmail.com>
date	Thu, 11 Oct 2012 16:15:46 -0700
parents	5a2ef447b80d
children	315bd0ceb97a

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"
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	5 #include "frameobject.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	7 #ifdef __cplusplus
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	8 extern "C" {
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	9 #endif
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 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;
37638 65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37609 diff changeset	13
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37609 diff changeset	14 Py_ssize_t
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37609 diff changeset	15 _Py_GetRefTotal(void)
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37609 diff changeset	16 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	17 PyObject *o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	18 Py_ssize_t total = _Py_RefTotal;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	19 /* ignore the references to the dummy object of the dicts and sets
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	20 because they are not reliable and not useful (now that the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	21 hash table code is well-tested) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	22 o = _PyDict_Dummy();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	23 if (o != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	24 total -= o->ob_refcnt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	25 o = _PySet_Dummy();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	26 if (o != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	27 total -= o->ob_refcnt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	28 return total;
37638 65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37609 diff changeset	29 }
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37609 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;
41832 a0ee3b2ba361 Add -3 option to the interpreter to warn about features that are Neal Norwitz <nnorwitz@gmail.com> parents: 41214 diff changeset	33 int Py_Py3kWarningFlag;
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19620 diff changeset	34
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	35 /* Object allocation routines used by NEWOBJ and NEWVAROBJ macros.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	36 These are used by the individual routines for object creation.
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	37 Do not call them otherwise, they do not initialize the object! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	38
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	39 #ifdef Py_TRACE_REFS
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	40 /* 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	41 * 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	42 * 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	43 */
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	44 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	45
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	46 /* 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	47 * 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	48 * 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	49 * 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	50 * 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	51 * relinking it into the front.
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	52 * 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	53 * 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	54 * 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	55 * 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	56 */
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28388 diff changeset	57 void
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	58 _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	59 {
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	60 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	61 if (!force) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	62 /* If it's initialized memory, op must be in or out of
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	63 * the list unambiguously.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	64 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	65 assert((op->_ob_prev == NULL) == (op->_ob_next == NULL));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	66 }
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	67 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	68 if (force \|\| op->_ob_prev == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	69 op->_ob_next = refchain._ob_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	70 op->_ob_prev = &refchain;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	71 refchain._ob_next->_ob_prev = op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	72 refchain._ob_next = op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	73 }
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28388 diff changeset	74 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	75 #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	76
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	77 #ifdef COUNT_ALLOCS
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	78 static PyTypeObject *type_list;
37832 174062f7c1be Comment typo fix Andrew M. Kuchling <amk@amk.ca> parents: 37831 diff changeset	79 /* All types are added to type_list, at least when
37831 d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	80 they get one object created. That makes them
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	81 immortal, which unfortunately contributes to
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	82 garbage itself. If unlist_types_without_objects
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	83 is set, they will be removed from the type_list
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	84 once the last object is deallocated. */
50627 f0e0c3536e22 Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 50370 diff changeset	85 static int unlist_types_without_objects;
f0e0c3536e22 Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 50370 diff changeset	86 extern Py_ssize_t tuple_zero_allocs, fast_tuple_allocs;
f0e0c3536e22 Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 50370 diff changeset	87 extern Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
f0e0c3536e22 Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 50370 diff changeset	88 extern Py_ssize_t null_strings, one_strings;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	89 void
37831 d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	90 dump_counts(FILE* f)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	91 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	92 PyTypeObject *tp;
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	93
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	94 for (tp = type_list; tp; tp = tp->tp_next)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	95 fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	96 "freed: %" PY_FORMAT_SIZE_T "d, "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	97 "max in use: %" PY_FORMAT_SIZE_T "d\n",
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	98 tp->tp_name, tp->tp_allocs, tp->tp_frees,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	99 tp->tp_maxalloc);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	100 fprintf(f, "fast tuple allocs: %" PY_FORMAT_SIZE_T "d, "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	101 "empty: %" PY_FORMAT_SIZE_T "d\n",
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	102 fast_tuple_allocs, tuple_zero_allocs);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	103 fprintf(f, "fast int allocs: pos: %" PY_FORMAT_SIZE_T "d, "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	104 "neg: %" PY_FORMAT_SIZE_T "d\n",
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	105 quick_int_allocs, quick_neg_int_allocs);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	106 fprintf(f, "null strings: %" PY_FORMAT_SIZE_T "d, "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	107 "1-strings: %" PY_FORMAT_SIZE_T "d\n",
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	108 null_strings, one_strings);
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	109 }
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	110
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	111 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	112 get_counts(void)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	113 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	114 PyTypeObject *tp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	115 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	116 PyObject *v;
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	117
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	118 result = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	119 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	120 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	121 for (tp = type_list; tp; tp = tp->tp_next) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	122 v = Py_BuildValue("(snnn)", tp->tp_name, tp->tp_allocs,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	123 tp->tp_frees, tp->tp_maxalloc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	124 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	125 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	126 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	127 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	128 if (PyList_Append(result, v) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	129 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	130 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	131 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	132 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	133 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	134 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	135 return result;
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	136 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	137
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	138 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	139 inc_count(PyTypeObject *tp)
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	140 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	141 if (tp->tp_next == NULL && tp->tp_prev == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	142 /* first time; insert in linked list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	143 if (tp->tp_next != NULL) /* sanity check */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	144 Py_FatalError("XXX inc_count sanity check");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	145 if (type_list)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	146 type_list->tp_prev = tp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	147 tp->tp_next = type_list;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	148 /* Note that as of Python 2.2, heap-allocated type objects
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	149 * can go away, but this code requires that they stay alive
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	150 * until program exit. That's why we're careful with
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	151 * refcounts here. type_list gets a new reference to tp,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	152 * while ownership of the reference type_list used to hold
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	153 * (if any) was transferred to tp->tp_next in the line above.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	154 * tp is thus effectively immortal after this.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	155 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	156 Py_INCREF(tp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	157 type_list = tp;
28388 f81239c12c60 Oops! Used a wrong preprocessor symbol. Tim Peters <tim.peters@gmail.com> parents: 28387 diff changeset	158 #ifdef Py_TRACE_REFS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	159 /* Also insert in the doubly-linked list of all objects,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	160 * if not already there.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	161 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	162 _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	163 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	164 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	165 tp->tp_allocs++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	166 if (tp->tp_allocs - tp->tp_frees > tp->tp_maxalloc)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	167 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	168 }
37831 d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	169
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	170 void dec_count(PyTypeObject *tp)
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	171 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	172 tp->tp_frees++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	173 if (unlist_types_without_objects &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	174 tp->tp_allocs == tp->tp_frees) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	175 /* unlink the type from type_list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	176 if (tp->tp_prev)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	177 tp->tp_prev->tp_next = tp->tp_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	178 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	179 type_list = tp->tp_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	180 if (tp->tp_next)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	181 tp->tp_next->tp_prev = tp->tp_prev;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	182 tp->tp_next = tp->tp_prev = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	183 Py_DECREF(tp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	184 }
37831 d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	185 }
d82dced6f1fa Remove types from type_list if they have no objects Martin v. Löwis <martin@v.loewis.de> parents: 37655 diff changeset	186
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	187 #endif
a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1324 diff changeset	188
24155 9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	189 #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	190 /* 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	191 void
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	192 _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	193 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	194 char buf[300];
24155 9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	195
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	196 PyOS_snprintf(buf, sizeof(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	197 "%s:%i object at %p has negative ref count "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	198 "%" PY_FORMAT_SIZE_T "d",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	199 fname, lineno, op, op->ob_refcnt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	200 Py_FatalError(buf);
24155 9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	201 }
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	202
9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24144 diff changeset	203 #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	204
31940 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_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	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_XINCREF(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
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	211 void
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	212 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	213 {
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	214 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	215 }
059740d52ae5 Two new public API functions, Py_IncRef and Py_DecRef. Useful for Thomas Heller <theller@ctypes.org> parents: 31738 diff changeset	216
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	217 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	218 PyObject_Init(PyObject op, PyTypeObject tp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	220 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	221 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	222 /* Any changes should be reflected in PyObject_INIT (objimpl.h) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	223 Py_TYPE(op) = tp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	224 _Py_NewReference(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	225 return op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	226 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	227
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	228 PyVarObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	229 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	230 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	231 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	232 return (PyVarObject *) PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	233 /* Any changes should be reflected in PyObject_INIT_VAR */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	234 op->ob_size = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	235 Py_TYPE(op) = tp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	236 _Py_NewReference((PyObject *)op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	237 return op;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	238 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	239
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	240 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	241 _PyObject_New(PyTypeObject *tp)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	242 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	243 PyObject *op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	244 op = (PyObject *) PyObject_MALLOC(_PyObject_SIZE(tp));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	245 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	246 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	247 return PyObject_INIT(op, tp);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	248 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	249
5535 20c2b715188e Oops, another forgotten renaming: varobject -> PyVarObject. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	250 PyVarObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	251 _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	252 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	253 PyVarObject *op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	254 const size_t size = _PyObject_VAR_SIZE(tp, nitems);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	255 op = (PyVarObject *) PyObject_MALLOC(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	256 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	257 return (PyVarObject *)PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	258 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	259 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	260
22982 d09740b2e03d Move PyObject_Malloc and PyObject_Free to obmalloc.c. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	261 /* for binary compatibility with 2.2 */
d09740b2e03d Move PyObject_Malloc and PyObject_Free to obmalloc.c. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	262 #undef _PyObject_Del
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	263 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	264 _PyObject_Del(PyObject *op)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	265 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	266 PyObject_FREE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	267 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	268
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	269 /* 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	270 static int
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	271 internal_print(PyObject op, FILE fp, int flags, int nesting)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	272 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	273 int ret = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	274 if (nesting > 10) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	275 PyErr_SetString(PyExc_RuntimeError, "print recursion");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	276 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	277 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	278 if (PyErr_CheckSignals())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	279 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	280 #ifdef USE_STACKCHECK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	281 if (PyOS_CheckStack()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	282 PyErr_SetString(PyExc_MemoryError, "stack overflow");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	283 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	284 }
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	285 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	286 clearerr(fp); /* Clear any previous error condition */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	287 if (op == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	288 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	289 fprintf(fp, "<nil>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	290 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	291 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	292 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	293 if (op->ob_refcnt <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	294 /* XXX(twouters) cast refcount to long until %zd is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	295 universally available */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	296 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	297 fprintf(fp, "<refcnt %ld at %p>",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	298 (long)op->ob_refcnt, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	299 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	300 else if (Py_TYPE(op)->tp_print == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	301 PyObject *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	302 if (flags & Py_PRINT_RAW)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	303 s = PyObject_Str(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	304 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	305 s = PyObject_Repr(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	306 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	307 ret = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	308 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	309 ret = internal_print(s, fp, Py_PRINT_RAW,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	310 nesting+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	311 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	312 Py_XDECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	314 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	315 ret = (*Py_TYPE(op)->tp_print)(op, fp, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	316 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	317 if (ret == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	318 if (ferror(fp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	319 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	320 clearerr(fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	321 ret = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	322 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	323 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	324 return ret;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	325 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	326
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	327 int
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	328 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	329 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	330 return internal_print(op, fp, flags, 0);
27234 e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	331 }
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	332
e9f45b8efd6b Fix SF bug #667147, Segmentation fault printing str subclass Neal Norwitz <nnorwitz@gmail.com> parents: 26263 diff changeset	333
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	334 /* For debugging convenience. See Misc/gdbinit for some useful gdb hooks */
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	335 void _PyObject_Dump(PyObject* op)
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	336 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	337 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	338 fprintf(stderr, "NULL\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	339 else {
52903 3889d9528601 Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from Georg Brandl <georg@python.org> parents: 51466 diff changeset	340 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	341 PyGILState_STATE gil;
52903 3889d9528601 Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from Georg Brandl <georg@python.org> parents: 51466 diff changeset	342 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	343 fprintf(stderr, "object : ");
52903 3889d9528601 Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from Georg Brandl <georg@python.org> parents: 51466 diff changeset	344 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	345 gil = PyGILState_Ensure();
52903 3889d9528601 Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from Georg Brandl <georg@python.org> parents: 51466 diff changeset	346 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	347 (void)PyObject_Print(op, stderr, 0);
52903 3889d9528601 Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from Georg Brandl <georg@python.org> parents: 51466 diff changeset	348 #ifdef WITH_THREAD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	349 PyGILState_Release(gil);
52903 3889d9528601 Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from Georg Brandl <georg@python.org> parents: 51466 diff changeset	350 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	351 /* XXX(twouters) cast refcount to long until %zd is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	352 universally available */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	353 fprintf(stderr, "\n"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	354 "type : %s\n"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	355 "refcount: %ld\n"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	356 "address : %p\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	357 Py_TYPE(op)==NULL ? "NULL" : Py_TYPE(op)->tp_name,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	358 (long)op->ob_refcnt,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	359 op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	360 }
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	361 }
16167 71ceaba3f615 PyObject_Dump(): Use %p format to print the address of the pointer. Barry Warsaw <barry@python.org> parents: 16165 diff changeset	362
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	363 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	364 PyObject_Repr(PyObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	365 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	366 if (PyErr_CheckSignals())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	367 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	368 #ifdef USE_STACKCHECK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	369 if (PyOS_CheckStack()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	370 PyErr_SetString(PyExc_MemoryError, "stack overflow");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	371 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	372 }
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	373 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	374 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	375 return PyString_FromString("<NULL>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	376 else if (Py_TYPE(v)->tp_repr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	377 return PyString_FromFormat("<%s object at %p>",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	378 Py_TYPE(v)->tp_name, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	379 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	380 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	381 res = (*Py_TYPE(v)->tp_repr)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	382 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	383 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	384 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	385 if (PyUnicode_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	386 PyObject* str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	387 str = PyUnicode_AsEncodedString(res, NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	388 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	389 if (str)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	390 res = str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	391 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	392 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	393 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	394 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	395 if (!PyString_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	396 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	397 "__repr__ returned non-string (type %.200s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	398 Py_TYPE(res)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	399 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	400 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	401 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	402 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	403 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	404 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	405
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	406 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	407 _PyObject_Str(PyObject *v)
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	408 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	409 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	410 int type_ok;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	411 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	412 return PyString_FromString("<NULL>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	413 if (PyString_CheckExact(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	414 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	415 return v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	416 }
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	417 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	418 if (PyUnicode_CheckExact(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	419 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	420 return v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	421 }
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	422 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	423 if (Py_TYPE(v)->tp_str == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	424 return PyObject_Repr(v);
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	425
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	426 /* It is possible for a type to have a tp_str representation that loops
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	427 infinitely. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	428 if (Py_EnterRecursiveCall(" while getting the str of an object"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	429 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	430 res = (*Py_TYPE(v)->tp_str)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	431 Py_LeaveRecursiveCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	432 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	433 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	434 type_ok = PyString_Check(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	435 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	436 type_ok = type_ok \|\| PyUnicode_Check(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	437 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	438 if (!type_ok) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	439 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	440 "__str__ returned non-string (type %.200s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	441 Py_TYPE(res)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	442 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	443 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	444 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	445 return 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	446 }
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	447
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 34931 diff changeset	448 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	449 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	450 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	451 PyObject *res = _PyObject_Str(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	452 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	453 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	454 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	455 if (PyUnicode_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	456 PyObject* str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	457 str = PyUnicode_AsEncodedString(res, NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	458 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	459 if (str)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	460 res = str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	461 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	462 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	463 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	464 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	465 assert(PyString_Check(res));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	466 return res;
1400 aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	467 }
aac8231a715c * mpzmodule.c: removed redundant mpz_print function. Guido van Rossum <guido@python.org> parents: 1361 diff changeset	468
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	469 #ifdef Py_USING_UNICODE
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	470 PyObject *
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	471 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	472 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	473 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	474 PyObject *func;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	475 PyObject *str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	476 int unicode_method_found = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	477 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	478
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	479 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	480 res = PyString_FromString("<NULL>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	481 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	482 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	483 str = PyUnicode_FromEncodedObject(res, NULL, "strict");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	484 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	485 return str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	486 } else if (PyUnicode_CheckExact(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	487 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	488 return v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	489 }
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	490
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	491 if (PyInstance_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	492 /* We're an instance of a classic class */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	493 /* Try __unicode__ from the instance -- alas we have no type */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	494 func = PyObject_GetAttr(v, unicodestr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	495 if (func != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	496 unicode_method_found = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	497 res = PyObject_CallFunctionObjArgs(func, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	498 Py_DECREF(func);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	499 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	500 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	501 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	502 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	503 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	504 else {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	505 /* Not a classic class instance, try __unicode__. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	506 func = _PyObject_LookupSpecial(v, "__unicode__", &unicodestr);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	507 if (func != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	508 unicode_method_found = 1;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	509 res = PyObject_CallFunctionObjArgs(func, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	510 Py_DECREF(func);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	511 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	512 else if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	513 return NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	514 }
47914 1bc543944daa Issue 2517: Allow unicode messages in Exceptions again by correctly bypassing the instance dictionary when looking up __unicode__ on new-style classes Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	515
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	516 /* Didn't find __unicode__ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	517 if (!unicode_method_found) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	518 if (PyUnicode_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	519 /* For a Unicode subtype that's didn't overwrite __unicode__,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	520 return a true Unicode object with the same data. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	521 return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(v),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	522 PyUnicode_GET_SIZE(v));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	523 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	524 if (PyString_CheckExact(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	525 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	526 res = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	527 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	528 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	529 if (Py_TYPE(v)->tp_str != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	530 res = (*Py_TYPE(v)->tp_str)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	531 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	532 res = PyObject_Repr(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	533 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	534 }
47914 1bc543944daa Issue 2517: Allow unicode messages in Exceptions again by correctly bypassing the instance dictionary when looking up __unicode__ on new-style classes Nick Coghlan <ncoghlan@gmail.com> parents: 47527 diff changeset	535
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	536 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	537 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	538 if (!PyUnicode_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	539 str = PyUnicode_FromEncodedObject(res, NULL, "strict");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	540 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	541 res = str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	542 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	543 return res;
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	544 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	545 #endif
16001 f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	546
f3740674ac5b Changes to recursive-object comparisons, having to do with a test case Guido van Rossum <guido@python.org> parents: 15962 diff changeset	547
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	548 /* Helper to warn about deprecated tp_compare return values. Return:
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	549 -2 for an exception;
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	550 -1 if v < w;
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	551 0 if v == w;
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	552 1 if v > w.
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	553 (This function cannot return 2.)
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	554 */
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	555 static int
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	556 adjust_tp_compare(int c)
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	557 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	558 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	559 if (c != -1 && c != -2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	560 PyObject t, v, *tb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	561 PyErr_Fetch(&t, &v, &tb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	562 if (PyErr_Warn(PyExc_RuntimeWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	563 "tp_compare didn't return -1 or -2 "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	564 "for exception") < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	565 Py_XDECREF(t);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	566 Py_XDECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	567 Py_XDECREF(tb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	568 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	569 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	570 PyErr_Restore(t, v, tb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	571 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	572 return -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	573 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	574 else if (c < -1 \|\| c > 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	575 if (PyErr_Warn(PyExc_RuntimeWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	576 "tp_compare didn't return -1, 0 or 1") < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	577 return -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	578 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	579 return c < -1 ? -1 : 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	580 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	581 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	582 assert(c >= -1 && c <= 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	583 return c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	584 }
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	585 }
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	586
2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	587
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	588 /* Macro to get the tp_richcompare field of a type if defined */
e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	589 #define RICHCOMPARE(t) (PyType_HasFeature((t), Py_TPFLAGS_HAVE_RICHCOMPARE) \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	590 ? (t)->tp_richcompare : NULL)
16236 e5d59a9dbfc0 Check the Py_TPFLAGS_HAVE_RICHCOMPARE flag before using the Guido van Rossum <guido@python.org> parents: 16197 diff changeset	591
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	592 /* 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	593 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	594
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	595 /* Try a genuine rich comparison, returning an object. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	596 NULL for exception;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	597 NotImplemented if this particular rich comparison is not implemented or
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	598 undefined;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	599 some object not equal to NotImplemented if it is implemented
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	600 (this latter object may not be a Boolean).
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	601 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	602 static PyObject *
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	603 try_rich_compare(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	604 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	605 richcmpfunc f;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	606 PyObject *res;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	607
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	608 if (v->ob_type != w->ob_type &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	609 PyType_IsSubtype(w->ob_type, v->ob_type) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	610 (f = RICHCOMPARE(w->ob_type)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	611 res = (*f)(w, v, _Py_SwappedOp[op]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	612 if (res != Py_NotImplemented)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	613 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	614 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	615 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	616 if ((f = RICHCOMPARE(v->ob_type)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	617 res = (*f)(v, w, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	618 if (res != Py_NotImplemented)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	619 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	620 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	621 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	622 if ((f = RICHCOMPARE(w->ob_type)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	623 return (*f)(w, v, _Py_SwappedOp[op]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	624 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	625 res = Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	626 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	627 return res;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	628 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	629
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	630 /* Try a genuine rich comparison, returning an int. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	631 -1 for exception (including the case where try_rich_compare() returns an
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	632 object that's not a Boolean);
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	633 0 if the outcome is false;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	634 1 if the outcome is true;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	635 2 if this particular rich comparison is not implemented or undefined.
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	636 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	637 static int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	638 try_rich_compare_bool(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	639 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	640 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	641 int ok;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	642
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	643 if (RICHCOMPARE(v->ob_type) == NULL && RICHCOMPARE(w->ob_type) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	644 return 2; /* Shortcut, avoid INCREF+DECREF */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	645 res = try_rich_compare(v, w, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	646 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	647 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	648 if (res == Py_NotImplemented) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	649 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	650 return 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	651 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	652 ok = PyObject_IsTrue(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	653 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	654 return ok;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	655 }
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 /* Try rich comparisons to determine a 3-way comparison. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	658 -2 for an exception;
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	659 -1 if v < w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	660 0 if v == w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	661 1 if v > w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	662 2 if this particular rich comparison is not implemented or undefined.
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	663 */
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	664 static int
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	665 try_rich_to_3way_compare(PyObject v, PyObject w)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	666 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	667 static struct { int op; int outcome; } tries[3] = {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	668 /* Try this operator, and if it is true, use this outcome: */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	669 {Py_EQ, 0},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	670 {Py_LT, -1},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	671 {Py_GT, 1},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	672 };
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	673 int i;
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	674
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	675 if (RICHCOMPARE(v->ob_type) == NULL && RICHCOMPARE(w->ob_type) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	676 return 2; /* Shortcut */
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	677
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	678 for (i = 0; i < 3; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	679 switch (try_rich_compare_bool(v, w, tries[i].op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	680 case -1:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	681 return -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	682 case 1:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	683 return tries[i].outcome;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	684 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	685 }
15962 f1751abf771f Deal properly (?) with comparing recursive datastructures. Guido van Rossum <guido@python.org> parents: 15952 diff changeset	686
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	687 return 2;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	688 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	689
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	690 /* Try a 3-way comparison, returning an int. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	691 -2 for an exception;
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	692 -1 if v < w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	693 0 if v == w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	694 1 if v > w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	695 2 if this particular 3-way comparison is not implemented or undefined.
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	696 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	697 static int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	698 try_3way_compare(PyObject v, PyObject w)
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	699 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	700 int c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	701 cmpfunc f;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	702
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	703 /* Comparisons involving instances are given to instance_compare,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	704 which has the same return conventions as this function. */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	705
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	706 f = v->ob_type->tp_compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	707 if (PyInstance_Check(v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	708 return (*f)(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	709 if (PyInstance_Check(w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	710 return (*w->ob_type->tp_compare)(v, w);
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	711
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	712 /* If both have the same (non-NULL) tp_compare, use it. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	713 if (f != NULL && f == w->ob_type->tp_compare) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	714 c = (*f)(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	715 return adjust_tp_compare(c);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	716 }
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19932 diff changeset	717
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	718 /* If either tp_compare is _PyObject_SlotCompare, that's safe. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	719 if (f == _PyObject_SlotCompare \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	720 w->ob_type->tp_compare == _PyObject_SlotCompare)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	721 return _PyObject_SlotCompare(v, w);
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19932 diff changeset	722
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	723 /* If we're here, v and w,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	724 a) are not instances;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	725 b) have different types or a type without tp_compare; and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	726 c) don't have a user-defined tp_compare.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	727 tp_compare implementations in C assume that both arguments
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	728 have their type, so we give up if the coercion fails or if
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	729 it yields types which are still incompatible (which can
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	730 happen with a user-defined nb_coerce).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	731 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	732 c = PyNumber_CoerceEx(&v, &w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	733 if (c < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	734 return -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	735 if (c > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	736 return 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	737 f = v->ob_type->tp_compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	738 if (f != NULL && f == w->ob_type->tp_compare) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	739 c = (*f)(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	740 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	741 Py_DECREF(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	742 return adjust_tp_compare(c);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	743 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	744
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	745 /* No comparison defined */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	746 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	747 Py_DECREF(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	748 return 2;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	749 }
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	750
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	751 /* Final fallback 3-way comparison, returning an int. Return:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	752 -2 if an error occurred;
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	753 -1 if v < w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	754 0 if v == w;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	755 1 if v > w.
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	756 */
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	757 static int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	758 default_3way_compare(PyObject v, PyObject w)
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	759 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	760 int c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	761 const char vname, wname;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	762
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	763 if (v->ob_type == w->ob_type) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	764 /* When comparing these pointers, they must be cast to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	765 * integer types (i.e. Py_uintptr_t, our spelling of C9X's
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	766 * uintptr_t). ANSI specifies that pointer compares other
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	767 * than == and != to non-related structures are undefined.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	768 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	769 Py_uintptr_t vv = (Py_uintptr_t)v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	770 Py_uintptr_t ww = (Py_uintptr_t)w;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	771 return (vv < ww) ? -1 : (vv > ww) ? 1 : 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	772 }
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	773
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	774 /* None is smaller than anything */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	775 if (v == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	776 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	777 if (w == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	778 return 1;
16123 f997ded4e219 New special case in comparisons: None is smaller than any other object Guido van Rossum <guido@python.org> parents: 16108 diff changeset	779
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	780 /* different type: compare type names; numbers are smaller */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	781 if (PyNumber_Check(v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	782 vname = "";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	783 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	784 vname = v->ob_type->tp_name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	785 if (PyNumber_Check(w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	786 wname = "";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	787 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	788 wname = w->ob_type->tp_name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	789 c = strcmp(vname, wname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	790 if (c < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	791 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	792 if (c > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	793 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	794 /* Same type name, or (more likely) incomparable numeric types */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	795 return ((Py_uintptr_t)(v->ob_type) < (
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	796 Py_uintptr_t)(w->ob_type)) ? -1 : 1;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	797 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	798
17698 aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	799 /* Do a 3-way comparison, by hook or by crook. Return:
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	800 -2 for an exception (but see below);
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	801 -1 if v < w;
17698 aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	802 0 if v == w;
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	803 1 if v > w;
23598 2b1d61781d63 Implement the intention of SF patch 472523 (but coded differently). Guido van Rossum <guido@python.org> parents: 23542 diff changeset	804 BUT: if the object implements a tp_compare function, it returns
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	805 whatever this function returns (whether with an exception or not).
17698 aad0adf806ad SF bug #422108 - Error in rich comparisons. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	806 */
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	807 static int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	808 do_cmp(PyObject v, PyObject w)
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	809 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	810 int c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	811 cmpfunc f;
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	812
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	813 if (v->ob_type == w->ob_type
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	814 && (f = v->ob_type->tp_compare) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	815 c = (*f)(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	816 if (PyInstance_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	817 /* Instance tp_compare has a different signature.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	818 But if it returns undefined we fall through. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	819 if (c != 2)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	820 return c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	821 /* Else fall through to try_rich_to_3way_compare() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	822 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	823 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	824 return adjust_tp_compare(c);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	825 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	826 /* We only get here if one of the following is true:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	827 a) v and w have different types
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	828 b) v and w have the same type, which doesn't have tp_compare
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	829 c) v and w are instances, and either __cmp__ is not defined or
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	830 __cmp__ returns NotImplemented
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	831 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	832 c = try_rich_to_3way_compare(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	833 if (c < 2)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	834 return c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	835 c = try_3way_compare(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	836 if (c < 2)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	837 return c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	838 return default_3way_compare(v, w);
2124 36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	839 }
36847b8b575d properly implement cmp() for class instances Guido van Rossum <guido@python.org> parents: 2113 diff changeset	840
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	841 /* Compare v to w. Return
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	842 -1 if v < w or exception (PyErr_Occurred() true in latter case).
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	843 0 if v == w.
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	844 1 if v > w.
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	845 XXX The docs (C API manual) say the return value is undefined in case
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	846 XXX of error.
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	847 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	848 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	849 PyObject_Compare(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	850 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	851 int result;
12406 ec6b6ca5d111 Fix PR#7 comparisons of recursive objects Jeremy Hylton <jeremy@alum.mit.edu> parents: 12327 diff changeset	852
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	853 if (v == NULL \|\| w == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	854 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	855 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	856 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	857 if (v == w)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	858 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	859 if (Py_EnterRecursiveCall(" in cmp"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	860 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	861 result = do_cmp(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	862 Py_LeaveRecursiveCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	863 return result < 0 ? -1 : result;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	864 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	865
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	866 /* Return (new reference to) Py_True or Py_False. */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	867 static PyObject *
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	868 convert_3way_to_object(int op, int c)
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	869 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	870 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	871 switch (op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	872 case Py_LT: c = c < 0; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	873 case Py_LE: c = c <= 0; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	874 case Py_EQ: c = c == 0; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	875 case Py_NE: c = c != 0; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	876 case Py_GT: c = c > 0; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	877 case Py_GE: c = c >= 0; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	878 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	879 result = c ? Py_True : Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	880 Py_INCREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	881 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	882 }
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	883
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	884 /* We want a rich comparison but don't have one. Try a 3-way cmp instead.
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	885 Return
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	886 NULL if error
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	887 Py_True if v op w
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	888 Py_False if not (v op w)
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	889 */
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	890 static PyObject *
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	891 try_3way_to_rich_compare(PyObject v, PyObject w, int op)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	892 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	893 int c;
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	894
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	895 c = try_3way_compare(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	896 if (c >= 2) {
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	897
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	898 /* Py3K warning if types are not equal and comparison isn't == or != */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	899 if (Py_Py3kWarningFlag &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	900 v->ob_type != w->ob_type && op != Py_EQ && op != Py_NE &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	901 PyErr_WarnEx(PyExc_DeprecationWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	902 "comparing unequal types not supported "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	903 "in 3.x", 1) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	904 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	905 }
45860 50771a3fad2c Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373. Steven Bethard <steven.bethard@gmail.com> parents: 44915 diff changeset	906
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	907 c = default_3way_compare(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	908 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	909 if (c <= -2)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	910 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	911 return convert_3way_to_object(op, c);
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 17781 diff changeset	912 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	913
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	914 /* Do rich comparison on v and w. Return
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	915 NULL if error
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	916 Else a new reference to an object other than Py_NotImplemented, usually(?):
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	917 Py_True if v op w
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	918 Py_False if not (v op w)
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	919 */
16079 c4355905b044 Remove a smelly export. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 16062 diff changeset	920 static PyObject *
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	921 do_richcmp(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	922 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	923 PyObject *res;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	924
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	925 res = try_rich_compare(v, w, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	926 if (res != Py_NotImplemented)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	927 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	928 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	929
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	930 return try_3way_to_rich_compare(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	931 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	932
20863 d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	933 /* Return:
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	934 NULL for exception;
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	935 some object not equal to NotImplemented if it is implemented
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	936 (this latter object may not be a Boolean).
d6ff1daae398 No code change -- just trying to document the return conditions for all Tim Peters <tim.peters@gmail.com> parents: 20612 diff changeset	937 */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	938 PyObject *
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	939 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	940 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	941 PyObject *res;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	942
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	943 assert(Py_LT <= op && op <= Py_GE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	944 if (Py_EnterRecursiveCall(" in cmp"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	945 return NULL;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	946
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	947 /* If the types are equal, and not old-style instances, try to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	948 get out cheap (don't bother with coercions etc.). */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	949 if (v->ob_type == w->ob_type && !PyInstance_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	950 cmpfunc fcmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	951 richcmpfunc frich = RICHCOMPARE(v->ob_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	952 /* If the type has richcmp, try it first. try_rich_compare
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	953 tries it two-sided, which is not needed since we've a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	954 single type only. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	955 if (frich != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	956 res = (*frich)(v, w, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	957 if (res != Py_NotImplemented)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	958 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	959 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	960 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	961 /* No richcmp, or this particular richmp not implemented.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	962 Try 3-way cmp. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	963 fcmp = v->ob_type->tp_compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	964 if (fcmp != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	965 int c = (*fcmp)(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	966 c = adjust_tp_compare(c);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	967 if (c == -2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	968 res = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	969 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	970 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	971 res = convert_3way_to_object(op, c);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	972 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	973 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	974 }
20865 f54828eb8e07 Rehabilitated the fast-path richcmp code, and sped it up. It wasn't Tim Peters <tim.peters@gmail.com> parents: 20863 diff changeset	975
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	976 /* Fast path not taken, or couldn't deliver a useful result. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	977 res = do_richcmp(v, w, op);
20865 f54828eb8e07 Rehabilitated the fast-path richcmp code, and sped it up. It wasn't Tim Peters <tim.peters@gmail.com> parents: 20863 diff changeset	978 Done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	979 Py_LeaveRecursiveCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	980 return res;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	981 }
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	982
17688 1ebb4e566257 Make 'x in y' and 'x not in y' (PySequence_Contains) play nice w/ iterators. Tim Peters <tim.peters@gmail.com> parents: 17673 diff changeset	983 /* Return -1 if error; 1 if v op w; 0 if not (v op w). */
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	984 int
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	985 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	986 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	987 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	988 int ok;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	989
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	990 /* Quick result when objects are the same.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	991 Guarantees that identity implies equality. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	992 if (v == w) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	993 if (op == Py_EQ)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	994 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	995 else if (op == Py_NE)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	996 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	997 }
31736 6fcbf6ac699a Add identity shortcut to PyObject_RichCompareBool. Raymond Hettinger <python@rcn.com> parents: 31433 diff changeset	998
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	999 res = PyObject_RichCompare(v, w, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1000 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1001 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1002 if (PyBool_Check(res))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1003 ok = (res == Py_True);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1004 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1005 ok = PyObject_IsTrue(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1006 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1007 return ok;
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1008 }
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1009
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1010 /* Set of hash utility functions to help maintaining the invariant that
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1011 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	1012
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1013 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	1014 */
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1015
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1016 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1017 _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	1018 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1019 double intpart, fractpart;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1020 int expo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1021 long hipart;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1022 long x; /* the final hash value */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1023 /* This is designed so that Python numbers of different types
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1024 * that compare equal hash to the same value; otherwise comparisons
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1025 * of mapping keys will turn out weird.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1026 */
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	1027
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1028 if (!Py_IS_FINITE(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1029 if (Py_IS_INFINITY(v))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1030 return v < 0 ? -271828 : 314159;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1031 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1032 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1033 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1034 fractpart = modf(v, &intpart);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1035 if (fractpart == 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1036 /* This must return the same hash as an equal int or long. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1037 if (intpart > LONG_MAX/2 \|\| -intpart > LONG_MAX/2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1038 /* Convert to long and use its hash. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1039 PyObject plong; / converted to Python long */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1040 plong = PyLong_FromDouble(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1041 if (plong == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1042 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1043 x = PyObject_Hash(plong);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1044 Py_DECREF(plong);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1045 return x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1046 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1047 /* Fits in a C long == a Python int, so is its own hash. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1048 x = (long)intpart;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1049 if (x == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1050 x = -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1051 return x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1052 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1053 /* The fractional part is non-zero, so we don't have to worry about
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1054 * making this match the hash of some other type.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1055 * Use frexp to get at the bits in the double.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1056 * Since the VAX D double format has 56 mantissa bits, which is the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1057 * most of any double format in use, each of these parts may have as
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1058 * many as (but no more than) 56 significant bits.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1059 * So, assuming sizeof(long) >= 4, each part can be broken into two
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1060 * longs; frexp and multiplication are used to do that.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1061 * Also, since the Cray double format has 15 exponent bits, which is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1062 * the most of any double format in use, shifting the exponent field
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1063 * left by 15 won't overflow a long (again assuming sizeof(long) >= 4).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1064 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1065 v = frexp(v, &expo);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1066 v = 2147483648.0; / 2*31 /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1067 hipart = (long)v; /* take the top 32 bits */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1068 v = (v - (double)hipart) * 2147483648.0; /* get the next 32 bits */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1069 x = hipart + (long)v + (expo << 15);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1070 if (x == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1071 x = -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1072 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	1073 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1074
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1075 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1076 _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	1077 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1078 long x;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1079 size_t y = (size_t)p;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1080 /* bottom 3 or 4 bits are likely to be 0; rotate y by 4 to avoid
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1081 excessive hash collisions for dicts and sets */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1082 y = (y >> 4) \| (y << (8 * SIZEOF_VOID_P - 4));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1083 x = (long)y;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1084 if (x == -1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1085 x = -2;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1086 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	1087 }
cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1088
47961 f9b80a820a25 Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful Nick Coghlan <ncoghlan@gmail.com> parents: 47914 diff changeset	1089 long
f9b80a820a25 Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful Nick Coghlan <ncoghlan@gmail.com> parents: 47914 diff changeset	1090 PyObject_HashNotImplemented(PyObject *self)
f9b80a820a25 Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful Nick Coghlan <ncoghlan@gmail.com> parents: 47914 diff changeset	1091 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1092 PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1093 self->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1094 return -1;
47961 f9b80a820a25 Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful Nick Coghlan <ncoghlan@gmail.com> parents: 47914 diff changeset	1095 }
13141 cca84745da3e This patch addresses two main issues: (1) There exist some non-fatal Fred Drake <fdrake@acm.org> parents: 13089 diff changeset	1096
75100 6b7704fe1be1 - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED Barry Warsaw <barry@python.org> parents: 68255 diff changeset	1097 _Py_HashSecret_t _Py_HashSecret;
6b7704fe1be1 - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED Barry Warsaw <barry@python.org> parents: 68255 diff changeset	1098
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1099 long
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1100 PyObject_Hash(PyObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1101 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1102 PyTypeObject *tp = v->ob_type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1103 if (tp->tp_hash != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1104 return (*tp->tp_hash)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1105 /* To keep to the general practice that inheriting
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1106 * solely from object in C code should work without
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1107 * an explicit call to PyType_Ready, we implicitly call
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1108 * PyType_Ready here and then check the tp_hash slot again
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1109 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1110 if (tp->tp_dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1111 if (PyType_Ready(tp) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1112 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1113 if (tp->tp_hash != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1114 return (*tp->tp_hash)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1115 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1116 if (tp->tp_compare == NULL && RICHCOMPARE(tp) == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1117 return _Py_HashPointer(v); /* Use address as hash value */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1118 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1119 /* If there's a cmp but no hash defined, the object can't be hashed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1120 return PyObject_HashNotImplemented(v);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1121 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1122
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1123 PyObject *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	1124 PyObject_GetAttrString(PyObject v, const char name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1125 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1126 PyObject w, res;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	1127
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1128 if (Py_TYPE(v)->tp_getattr != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1129 return (Py_TYPE(v)->tp_getattr)(v, (char)name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1130 w = PyString_InternFromString(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1131 if (w == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1132 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1133 res = PyObject_GetAttr(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1134 Py_XDECREF(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1135 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1136 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1137
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1138 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	1139 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	1140 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1141 PyObject *res = PyObject_GetAttrString(v, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1142 if (res != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1143 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1144 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1145 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1146 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1147 return 0;
1324 716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1148 }
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1149
716be765a79b * accessobject.c (ownercheck): allow a base class access to protected Guido van Rossum <guido@python.org> parents: 1282 diff changeset	1150 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	1151 PyObject_SetAttrString(PyObject v, const char name, PyObject *w)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1152 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1153 PyObject *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1154 int res;
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3770 diff changeset	1155
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1156 if (Py_TYPE(v)->tp_setattr != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1157 return (Py_TYPE(v)->tp_setattr)(v, (char)name, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1158 s = PyString_InternFromString(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1159 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1160 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1161 res = PyObject_SetAttr(v, s, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1162 Py_XDECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1163 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1164 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1165
5560 8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1166 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1167 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	1168 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1169 PyTypeObject *tp = Py_TYPE(v);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1170
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1171 if (!PyString_Check(name)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1172 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1173 /* The Unicode to string conversion is done here because the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1174 existing tp_getattro slots expect a string object as name
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1175 and we wouldn't want to break those. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1176 if (PyUnicode_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1177 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1178 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1179 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1180 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1181 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1182 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1183 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1184 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1185 "attribute name must be string, not '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1186 Py_TYPE(name)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1187 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1188 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1189 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1190 if (tp->tp_getattro != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1191 return (*tp->tp_getattro)(v, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1192 if (tp->tp_getattr != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1193 return (*tp->tp_getattr)(v, PyString_AS_STRING(name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1194 PyErr_Format(PyExc_AttributeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1195 "'%.50s' object has no attribute '%.400s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1196 tp->tp_name, PyString_AS_STRING(name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1197 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	1198 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1199
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1200 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1201 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	1202 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1203 PyObject *res = PyObject_GetAttr(v, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1204 if (res != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1205 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1206 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1207 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1208 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1209 return 0;
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
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1212 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1213 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	1214 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1215 PyTypeObject *tp = Py_TYPE(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1216 int err;
14660 983502b2cd43 PyObject_SetAttr() and PyObject_GetAttr() now also accept Unicode Marc-André Lemburg <mal@egenix.com> parents: 14375 diff changeset	1217
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1218 if (!PyString_Check(name)){
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19294 diff changeset	1219 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1220 /* The Unicode to string conversion is done here because the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1221 existing tp_setattro slots expect a string object as name
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1222 and we wouldn't want to break those. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1223 if (PyUnicode_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1224 name = PyUnicode_AsEncodedString(name, NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1225 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1226 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1227 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1228 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1229 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1230 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1231 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1232 "attribute name must be string, not '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1233 Py_TYPE(name)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1234 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1235 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1236 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1237 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1238 Py_INCREF(name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1239
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1240 PyString_InternInPlace(&name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1241 if (tp->tp_setattro != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1242 err = (*tp->tp_setattro)(v, name, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1243 Py_DECREF(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1244 return err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1245 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1246 if (tp->tp_setattr != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1247 err = (*tp->tp_setattr)(v, PyString_AS_STRING(name), value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1248 Py_DECREF(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1249 return err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1250 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1251 Py_DECREF(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1252 if (tp->tp_getattr == NULL && tp->tp_getattro == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1253 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1254 "'%.100s' object has no attributes "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1255 "(%s .%.100s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1256 tp->tp_name,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1257 value==NULL ? "del" : "assign to",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1258 PyString_AS_STRING(name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1259 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1260 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1261 "'%.100s' object has only read-only attributes "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1262 "(%s .%.100s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1263 tp->tp_name,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1264 value==NULL ? "del" : "assign to",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1265 PyString_AS_STRING(name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1266 return -1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1267 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1268
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1269 /* 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	1270
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1271 PyObject **
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1272 _PyObject_GetDictPtr(PyObject *obj)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1273 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1274 Py_ssize_t dictoffset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1275 PyTypeObject *tp = Py_TYPE(obj);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1276
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1277 if (!(tp->tp_flags & Py_TPFLAGS_HAVE_CLASS))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1278 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1279 dictoffset = tp->tp_dictoffset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1280 if (dictoffset == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1281 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1282 if (dictoffset < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1283 Py_ssize_t tsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1284 size_t size;
22106 93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	1285
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1286 tsize = ((PyVarObject *)obj)->ob_size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1287 if (tsize < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1288 tsize = -tsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1289 size = _PyObject_VAR_SIZE(tp, tsize);
22106 93eb4b61f687 SF patch 514641 (Naofumi Honda) - Negative ob_size of LongObjects Guido van Rossum <guido@python.org> parents: 21186 diff changeset	1290
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1291 dictoffset += (long)size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1292 assert(dictoffset > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1293 assert(dictoffset % SIZEOF_VOID_P == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1294 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1295 return (PyObject *) ((char )obj + dictoffset);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1296 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1297
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1298 PyObject *
28320 fd5ef7003469 Renamed PyObject_GenericGetIter to PyObject_SelfIter Raymond Hettinger <python@rcn.com> parents: 28308 diff changeset	1299 PyObject_SelfIter(PyObject *obj)
28308 9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1300 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1301 Py_INCREF(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1302 return obj;
28308 9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1303 }
9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1304
50754 e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1305 /* Helper used when the __next__ method is removed from a type:
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1306 tp_iternext is never NULL and can be safely called without checking
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1307 on every iteration.
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1308 */
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1309
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1310 PyObject *
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1311 _PyObject_NextNotImplemented(PyObject *self)
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1312 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1313 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1314 "'%.200s' object is not iterable",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1315 Py_TYPE(self)->tp_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	1316 return NULL;
50754 e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1317 }
e9748db47635 #3720: Interpreter crashes when an evil iterator removes its own next function. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50627 diff changeset	1318
33489 4cb1016525b7 Move a comment back to its rightful location. Michael W. Hudson <mwh@python.net> parents: 32981 diff changeset	1319 /* 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	1320
28308 9c3572a5575f Created PyObject_GenericGetIter(). Raymond Hettinger <python@rcn.com> parents: 27966 diff changeset	1321 PyObject *
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1322 _PyObject_GenericGetAttrWithDict(PyObject obj, PyObject name, PyObject *dict)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1323 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1324 PyTypeObject *tp = Py_TYPE(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1325 PyObject *descr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1326 PyObject *res = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1327 descrgetfunc f;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1328 Py_ssize_t dictoffset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1329 PyObject **dictptr;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1330
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1331 if (!PyString_Check(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	1332 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1333 /* The Unicode to string conversion is done here because the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1334 existing tp_setattro slots expect a string object as name
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1335 and we wouldn't want to break those. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1336 if (PyUnicode_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1337 name = PyUnicode_AsEncodedString(name, NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1338 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1339 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1340 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1341 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1342 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1343 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1344 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1345 "attribute name must be string, not '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1346 Py_TYPE(name)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1347 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1348 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1349 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1350 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1351 Py_INCREF(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	1352
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1353 if (tp->tp_dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1354 if (PyType_Ready(tp) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1355 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1356 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1357
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1358 #if 0 /* XXX this is not quite _PyType_Lookup anymore */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1359 /* Inline _PyType_Lookup */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1360 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1361 Py_ssize_t i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1362 PyObject mro, base, *dict;
24897 6310a4a21eb8 Another modest speedup in PyObject_GenericGetAttr(): inline the call Guido van Rossum <guido@python.org> parents: 24894 diff changeset	1363
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1364 /* Look in tp_dict of types in MRO */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1365 mro = tp->tp_mro;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1366 assert(mro != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1367 assert(PyTuple_Check(mro));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1368 n = PyTuple_GET_SIZE(mro);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1369 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1370 base = PyTuple_GET_ITEM(mro, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1371 if (PyClass_Check(base))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1372 dict = ((PyClassObject *)base)->cl_dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1373 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1374 assert(PyType_Check(base));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1375 dict = ((PyTypeObject *)base)->tp_dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1376 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1377 assert(dict && PyDict_Check(dict));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1378 descr = PyDict_GetItem(dict, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1379 if (descr != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1380 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1381 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1382 }
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1383 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1384 descr = _PyType_Lookup(tp, name);
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1385 #endif
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1386
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1387 Py_XINCREF(descr);
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 28669 diff changeset	1388
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1389 f = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1390 if (descr != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1391 PyType_HasFeature(descr->ob_type, Py_TPFLAGS_HAVE_CLASS)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1392 f = descr->ob_type->tp_descr_get;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1393 if (f != NULL && PyDescr_IsData(descr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1394 res = f(descr, obj, (PyObject *)obj->ob_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1395 Py_DECREF(descr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1396 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1397 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1398 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1399
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1400 if (dict == NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1401 /* Inline _PyObject_GetDictPtr */
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1402 dictoffset = tp->tp_dictoffset;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1403 if (dictoffset != 0) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1404 if (dictoffset < 0) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1405 Py_ssize_t tsize;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1406 size_t size;
24894 8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1407
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1408 tsize = ((PyVarObject *)obj)->ob_size;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1409 if (tsize < 0)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1410 tsize = -tsize;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1411 size = _PyObject_VAR_SIZE(tp, tsize);
24894 8862bc59685a Inline call to _PyObject_GetDictPtr() in PyObject_GenericGetAttr(). Guido van Rossum <guido@python.org> parents: 24644 diff changeset	1412
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1413 dictoffset += (long)size;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1414 assert(dictoffset > 0);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1415 assert(dictoffset % SIZEOF_VOID_P == 0);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1416 }
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1417 dictptr = (PyObject *) ((char )obj + dictoffset);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1418 dict = *dictptr;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1419 }
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1420 }
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1421 if (dict != NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1422 Py_INCREF(dict);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1423 res = PyDict_GetItem(dict, name);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1424 if (res != NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1425 Py_INCREF(res);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1426 Py_XDECREF(descr);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1427 Py_DECREF(dict);
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1428 goto done;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1429 }
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1430 Py_DECREF(dict);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1431 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1432
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1433 if (f != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1434 res = f(descr, obj, (PyObject *)Py_TYPE(obj));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1435 Py_DECREF(descr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1436 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1437 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1438
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1439 if (descr != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1440 res = descr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1441 /* descr was already increfed above */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1442 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1443 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1444
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1445 PyErr_Format(PyExc_AttributeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1446 "'%.50s' object has no attribute '%.400s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1447 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	1448 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1449 Py_DECREF(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1450 return res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1451 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1452
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1453 PyObject *
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1454 PyObject_GenericGetAttr(PyObject obj, PyObject name)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1455 {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1456 return _PyObject_GenericGetAttrWithDict(obj, name, NULL);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1457 }
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1458
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1459 int
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1460 _PyObject_GenericSetAttrWithDict(PyObject obj, PyObject name,
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1461 PyObject value, PyObject dict)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1462 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1463 PyTypeObject *tp = Py_TYPE(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1464 PyObject *descr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1465 descrsetfunc f;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1466 PyObject **dictptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1467 int res = -1;
21186 0189186f4ed9 PyObject_Generic{Get,Set}Attr(): ensure that the attribute name is a Guido van Rossum <guido@python.org> parents: 20865 diff changeset	1468
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1469 if (!PyString_Check(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	1470 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1471 /* The Unicode to string conversion is done here because the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1472 existing tp_setattro slots expect a string object as name
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1473 and we wouldn't want to break those. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1474 if (PyUnicode_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1475 name = PyUnicode_AsEncodedString(name, NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1476 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1477 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1478 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1479 else
22302 a0cc52735e6e Patch #517521: Consider byte strings before Unicode strings Martin v. Löwis <martin@v.loewis.de> parents: 22112 diff changeset	1480 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1481 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1482 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1483 "attribute name must be string, not '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1484 Py_TYPE(name)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1485 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1486 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1487 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1488 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1489 Py_INCREF(name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1490
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1491 if (tp->tp_dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1492 if (PyType_Ready(tp) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1493 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1494 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1495
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1496 descr = _PyType_Lookup(tp, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1497 f = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1498 if (descr != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1499 PyType_HasFeature(descr->ob_type, Py_TPFLAGS_HAVE_CLASS)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1500 f = descr->ob_type->tp_descr_set;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1501 if (f != NULL && PyDescr_IsData(descr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1502 res = f(descr, obj, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1503 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1504 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1505 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1506
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1507 if (dict == NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1508 dictptr = _PyObject_GetDictPtr(obj);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1509 if (dictptr != NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1510 dict = *dictptr;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1511 if (dict == NULL && value != NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1512 dict = PyDict_New();
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1513 if (dict == NULL)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1514 goto done;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1515 *dictptr = dict;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1516 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1517 }
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1518 }
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1519 if (dict != NULL) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1520 Py_INCREF(dict);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1521 if (value == NULL)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1522 res = PyDict_DelItem(dict, name);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1523 else
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1524 res = PyDict_SetItem(dict, name, value);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1525 if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1526 PyErr_SetObject(PyExc_AttributeError, name);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1527 Py_DECREF(dict);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1528 goto done;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1529 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1531 if (f != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1532 res = f(descr, obj, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1533 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1534 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1535
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1536 if (descr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1537 PyErr_Format(PyExc_AttributeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1538 "'%.100s' object has no attribute '%.200s'",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1539 tp->tp_name, PyString_AS_STRING(name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1540 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1541 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	1542
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1543 PyErr_Format(PyExc_AttributeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1544 "'%.50s' object attribute '%.400s' is read-only",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1545 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	1546 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1547 Py_DECREF(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1548 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	1549 }
8ec298b255a2 Moved PyObject_{Get,Set}Attr here (from dictobject) and add PyObject_HasAttr. Guido van Rossum <guido@python.org> parents: 5535 diff changeset	1550
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1551 int
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1552 PyObject_GenericSetAttr(PyObject obj, PyObject name, PyObject *value)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1553 {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1554 return _PyObject_GenericSetAttrWithDict(obj, name, value, NULL);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1555 }
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1556
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	1557
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1558 /* 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	1559 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	1560
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1561 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1562 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	1563 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1564 Py_ssize_t res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1565 if (v == Py_True)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1566 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1567 if (v == Py_False)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1568 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1569 if (v == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1570 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1571 else if (v->ob_type->tp_as_number != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1572 v->ob_type->tp_as_number->nb_nonzero != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1573 res = (*v->ob_type->tp_as_number->nb_nonzero)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1574 else if (v->ob_type->tp_as_mapping != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1575 v->ob_type->tp_as_mapping->mp_length != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1576 res = (*v->ob_type->tp_as_mapping->mp_length)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1577 else if (v->ob_type->tp_as_sequence != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1578 v->ob_type->tp_as_sequence->sq_length != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1579 res = (*v->ob_type->tp_as_sequence->sq_length)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1580 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1581 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1582 /* if it is negative, it should be either -1 or -2 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1583 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	1584 }
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1585
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	1586 /* equivalent of 'not v'
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1587 Return -1 if an error occurred */
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1588
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1589 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1590 PyObject_Not(PyObject *v)
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1591 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1592 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1593 res = PyObject_IsTrue(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1594 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1595 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1596 return res == 0;
7935 aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1597 }
aa7d69d67c81 Add PyObject_Not(). Guido van Rossum <guido@python.org> parents: 7119 diff changeset	1598
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1599 /* Coerce two numeric types to the "larger" one.
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1600 Increment the reference count on each argument.
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1601 Return value:
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1602 -1 if an error occurred;
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1603 0 if the coercion succeeded (and then the reference counts are increased);
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1604 1 if no coercion is possible (and no error is raised).
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1605 */
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1606 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1607 PyNumber_CoerceEx(PyObject pv, PyObject pw)
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1608 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1609 register PyObject v = pv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1610 register PyObject w = pw;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1611 int res;
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1612
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1613 /* Shortcut only for old-style types */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1614 if (v->ob_type == w->ob_type &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1615 !PyType_HasFeature(v->ob_type, Py_TPFLAGS_CHECKTYPES))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1616 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1617 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1618 Py_INCREF(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1619 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1620 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1621 if (v->ob_type->tp_as_number && v->ob_type->tp_as_number->nb_coerce) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1622 res = (*v->ob_type->tp_as_number->nb_coerce)(pv, pw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1623 if (res <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1624 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1625 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1626 if (w->ob_type->tp_as_number && w->ob_type->tp_as_number->nb_coerce) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1627 res = (*w->ob_type->tp_as_number->nb_coerce)(pw, pv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1628 if (res <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1629 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1630 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1631 return 1;
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1632 }
b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1633
15941 5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1634 /* Coerce two numeric types to the "larger" one.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1635 Increment the reference count on each argument.
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1636 Return -1 and raise an exception if no coercion is possible
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1637 (and then no reference count is incremented).
5abae795742e Rich comparisons. Refactored internal routine do_cmp() and added APIs Guido van Rossum <guido@python.org> parents: 15726 diff changeset	1638 */
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1639 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1640 PyNumber_Coerce(PyObject pv, PyObject pw)
6597 b88fd3894d5a Add a new function PyNumber_CoerceEx() which works just like Guido van Rossum <guido@python.org> parents: 5981 diff changeset	1641 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1642 int err = PyNumber_CoerceEx(pv, pw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1643 if (err <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1644 return err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1645 PyErr_SetString(PyExc_TypeError, "number coercion failed");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1646 return -1;
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1647 }
76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2079 diff changeset	1648
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1649
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1650 /* Test whether an object can be called */
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1651
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1652 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1653 PyCallable_Check(PyObject *x)
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1654 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1655 if (x == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1656 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1657 if (PyInstance_Check(x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1658 PyObject *call = PyObject_GetAttrString(x, "__call__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1659 if (call == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1660 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1661 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1662 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1663 /* Could test recursively but don't, for fear of endless
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1664 recursion if some joker sets self.__call__ = self */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1665 Py_DECREF(call);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1666 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1667 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1668 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1669 return x->ob_type->tp_call != NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1670 }
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1671 }
0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1672
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1673 /* ------------------------- PyObject_Dir() helpers ------------------------- */
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1674
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	1675 /* 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	1676 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	1677 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	1678 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	1679 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	1680 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	1681 */
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	1682
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	1683 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	1684 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	1685 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1686 PyObject *classdict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1687 PyObject *bases;
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	1688
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1689 assert(PyDict_Check(dict));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1690 assert(aclass);
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	1691
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1692 /* Merge in the type's dict (if any). */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1693 classdict = PyObject_GetAttrString(aclass, "__dict__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1694 if (classdict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1695 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1696 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1697 int status = PyDict_Update(dict, classdict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1698 Py_DECREF(classdict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1699 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1700 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1701 }
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	1702
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1703 /* Recursively merge in the base types' (if any) dicts. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1704 bases = PyObject_GetAttrString(aclass, "__bases__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1705 if (bases == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1706 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1707 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1708 /* We have no guarantee that bases is a real tuple */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1709 Py_ssize_t i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1710 n = PySequence_Size(bases); /* This better be right */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1711 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1712 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1713 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1714 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1715 int status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1716 PyObject *base = PySequence_GetItem(bases, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1717 if (base == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1718 Py_DECREF(bases);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1719 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1720 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1721 status = merge_class_dict(dict, base);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1722 Py_DECREF(base);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1723 if (status < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1724 Py_DECREF(bases);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1725 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1726 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1727 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1728 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1729 Py_DECREF(bases);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1730 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1731 return 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	1732 }
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	1733
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1734 /* Helper for PyObject_Dir.
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1735 If obj has an attr named attrname that's a list, merge its string
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1736 elements into keys of dict.
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1737 Return 0 on success, -1 on error. Errors due to not finding the attr,
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1738 or the attr not being a list, are suppressed.
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1739 */
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1740
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1741 static int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35331 diff changeset	1742 merge_list_attr(PyObject* dict, PyObject* obj, const char *attrname)
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1743 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1744 PyObject *list;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1745 int result = 0;
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1746
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1747 assert(PyDict_Check(dict));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1748 assert(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1749 assert(attrname);
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1750
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1751 list = PyObject_GetAttrString(obj, attrname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1752 if (list == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1753 PyErr_Clear();
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1754
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1755 else if (PyList_Check(list)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1756 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1757 for (i = 0; i < PyList_GET_SIZE(list); ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1758 PyObject *item = PyList_GET_ITEM(list, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1759 if (PyString_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1760 result = PyDict_SetItem(dict, item, Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1761 if (result < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1762 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1763 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1764 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1765 if (Py_Py3kWarningFlag &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1766 (strcmp(attrname, "__members__") == 0 \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1767 strcmp(attrname, "__methods__") == 0)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1768 if (PyErr_WarnEx(PyExc_DeprecationWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1769 "__members__ and __methods__ not "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1770 "supported in 3.x", 1) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1771 Py_XDECREF(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1772 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1773 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1774 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1775 }
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1776
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1777 Py_XDECREF(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1778 return result;
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1779 }
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1780
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1781 /* Helper for PyObject_Dir without arguments: returns the local scope. */
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1782 static PyObject *
41214 d1ba8134528e Remove warning: funcion declaration isn't a prototype Jeremy Hylton <jeremy@alum.mit.edu> parents: 41140 diff changeset	1783 _dir_locals(void)
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	1784 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1785 PyObject *names;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1786 PyObject *locals = PyEval_GetLocals();
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	1787
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1788 if (locals == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1789 PyErr_SetString(PyExc_SystemError, "frame does not exist");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1790 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1791 }
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1792
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1793 names = PyMapping_Keys(locals);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1794 if (!names)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1795 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1796 if (!PyList_Check(names)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1797 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1798 "dir(): expected keys() of locals to be a list, "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1799 "not '%.200s'", Py_TYPE(names)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1800 Py_DECREF(names);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1801 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1802 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1803 /* the locals don't need to be DECREF'd */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1804 return names;
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1805 }
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1806
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1807 /* Helper for PyObject_Dir of type objects: returns __dict__ and __bases__.
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1808 We deliberately don't suck up its __class__, as methods belonging to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1809 metaclass would probably be more confusing than helpful.
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1810 */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1811 static PyObject *
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1812 _specialized_dir_type(PyObject *obj)
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1813 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1814 PyObject *result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1815 PyObject *dict = PyDict_New();
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1816
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1817 if (dict != NULL && merge_class_dict(dict, obj) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1818 result = PyDict_Keys(dict);
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1819
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1820 Py_XDECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1821 return result;
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1822 }
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1823
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1824 /* Helper for PyObject_Dir of module objects: returns the module's __dict__. */
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1825 static PyObject *
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1826 _specialized_dir_module(PyObject *obj)
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1827 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1828 PyObject *result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1829 PyObject *dict = PyObject_GetAttrString(obj, "__dict__");
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1830
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1831 if (dict != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1832 if (PyDict_Check(dict))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1833 result = PyDict_Keys(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1834 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1835 char *name = PyModule_GetName(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1836 if (name)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1837 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1838 "%.200s.__dict__ is not a dictionary",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1839 name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1840 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1841 }
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	1842
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1843 Py_XDECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1844 return result;
19932 621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1845 }
621ed13445de PyObject_Dir(): Merge in __members__ and __methods__ too (if they exist, Tim Peters <tim.peters@gmail.com> parents: 19931 diff changeset	1846
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1847 /* Helper for PyObject_Dir of generic objects: returns __dict__, __class__,
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1848 and recursively up the __class__.__bases__ chain.
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1849 */
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1850 static PyObject *
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1851 _generic_dir(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	1852 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1853 PyObject *result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1854 PyObject *dict = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1855 PyObject *itsclass = 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	1856
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1857 /* Get __dict__ (which may or may not be a real dict...) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1858 dict = PyObject_GetAttrString(obj, "__dict__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1859 if (dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1860 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1861 dict = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1862 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1863 else if (!PyDict_Check(dict)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1864 Py_DECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1865 dict = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1866 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1867 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1868 /* Copy __dict__ to avoid mutating it. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1869 PyObject *temp = PyDict_Copy(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1870 Py_DECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1871 dict = temp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1872 }
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	1873
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1874 if (dict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1875 goto error;
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1876
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1877 /* Merge in __members__ and __methods__ (if any).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1878 * This is removed in Python 3000. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1879 if (merge_list_attr(dict, obj, "__members__") < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1880 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1881 if (merge_list_attr(dict, obj, "__methods__") < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1882 goto error;
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	1883
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1884 /* Merge in attrs reachable from its class. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1885 itsclass = PyObject_GetAttrString(obj, "__class__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1886 if (itsclass == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1887 /* XXX(tomer): Perhaps fall back to obj->ob_type if no
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1888 __class__ exists? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1889 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1890 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1891 if (merge_class_dict(dict, itsclass) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1892 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1893 }
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	1894
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1895 result = PyDict_Keys(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1896 /* fall through */
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1897 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1898 Py_XDECREF(itsclass);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1899 Py_XDECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1900 return result;
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1901 }
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	1902
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1903 /* Helper for PyObject_Dir: object introspection.
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1904 This calls one of the above specialized versions if no __dir__ method
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1905 exists. */
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1906 static PyObject *
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1907 _dir_object(PyObject *obj)
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1908 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1909 PyObject *result = NULL;
70312 b2fc6b9f850f correctly lookup __dir__ Benjamin Peterson <benjamin@python.org> parents: 68256 diff changeset	1910 static PyObject *dir_str = NULL;
70322 90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1911 PyObject *dirfunc;
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	1912
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1913 assert(obj);
70322 90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1914 if (PyInstance_Check(obj)) {
90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1915 dirfunc = PyObject_GetAttrString(obj, "__dir__");
70326 d70533533f77 must clear an AttributeError if it is set Benjamin Peterson <benjamin@python.org> parents: 70322 diff changeset	1916 if (dirfunc == NULL) {
d70533533f77 must clear an AttributeError if it is set Benjamin Peterson <benjamin@python.org> parents: 70322 diff changeset	1917 if (PyErr_ExceptionMatches(PyExc_AttributeError))
d70533533f77 must clear an AttributeError if it is set Benjamin Peterson <benjamin@python.org> parents: 70322 diff changeset	1918 PyErr_Clear();
d70533533f77 must clear an AttributeError if it is set Benjamin Peterson <benjamin@python.org> parents: 70322 diff changeset	1919 else
d70533533f77 must clear an AttributeError if it is set Benjamin Peterson <benjamin@python.org> parents: 70322 diff changeset	1920 return NULL;
d70533533f77 must clear an AttributeError if it is set Benjamin Peterson <benjamin@python.org> parents: 70322 diff changeset	1921 }
70322 90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1922 }
90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1923 else {
90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1924 dirfunc = _PyObject_LookupSpecial(obj, "__dir__", &dir_str);
70312 b2fc6b9f850f correctly lookup __dir__ Benjamin Peterson <benjamin@python.org> parents: 68256 diff changeset	1925 if (PyErr_Occurred())
b2fc6b9f850f correctly lookup __dir__ Benjamin Peterson <benjamin@python.org> parents: 68256 diff changeset	1926 return NULL;
70322 90399e508ce3 handle old-style instances Benjamin Peterson <benjamin@python.org> parents: 70312 diff changeset	1927 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1928 if (dirfunc == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1929 /* use default implementation */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1930 if (PyModule_Check(obj))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1931 result = _specialized_dir_module(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1932 else if (PyType_Check(obj) \|\| PyClass_Check(obj))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1933 result = _specialized_dir_type(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1934 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1935 result = _generic_dir(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1936 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1937 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1938 /* use __dir__ */
70312 b2fc6b9f850f correctly lookup __dir__ Benjamin Peterson <benjamin@python.org> parents: 68256 diff changeset	1939 result = PyObject_CallFunctionObjArgs(dirfunc, NULL);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1940 Py_DECREF(dirfunc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1941 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1942 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	1943
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1944 /* result must be a list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1945 /* XXX(gbrandl): could also check if all items are strings */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1946 if (!PyList_Check(result)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1947 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1948 "__dir__() must return a list, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1949 Py_TYPE(result)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1950 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1951 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1952 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1953 }
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	1954
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1955 return result;
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1956 }
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	1957
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1958 /* Implementation of dir() -- if obj is NULL, returns the names in the current
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1959 (local) scope. Otherwise, performs introspection of the object: returns a
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1960 sorted list of attribute names (supposedly) accessible from the object
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1961 */
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1962 PyObject *
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1963 PyObject_Dir(PyObject *obj)
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1964 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1965 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	1966
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1967 if (obj == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1968 /* no object -- introspect the locals */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1969 result = _dir_locals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1970 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1971 /* object -- introspect the object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1972 result = _dir_object(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	1973
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1974 assert(result == NULL \|\| PyList_Check(result));
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 39487 diff changeset	1975
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1976 if (result != NULL && PyList_Sort(result) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1977 /* sorting the list failed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1978 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1979 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1980 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1981
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1982 return 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	1983 }
2237 0b0b18d655d2 move callable() here Guido van Rossum <guido@python.org> parents: 2160 diff changeset	1984
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1985 /*
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1986 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	1987 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	1988 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	1989 (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	1990 */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1991
739 ab1b3486b226 Fix lint bug Guido van Rossum <guido@python.org> parents: 512 diff changeset	1992 /* ARGSUSED */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	1993 static PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1994 none_repr(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	1995 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	1996 return PyString_FromString("None");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1997 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1998
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	1999 /* ARGUSED */
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	2000 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	2001 none_dealloc(PyObject* ignore)
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	2002 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2003 /* This should never get called, but we also don't want to SEGV if
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2004 * we accidentally decref None out of existence.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2005 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2006 Py_FatalError("deallocating None");
16165 0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	2007 }
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	2008
0a72070eab6e A few miscellaneous helpers. Barry Warsaw <barry@python.org> parents: 16123 diff changeset	2009
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2010 static PyTypeObject PyNone_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2011 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2012 "NoneType",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2013 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2014 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2015 none_dealloc, /tp_dealloc/ /never called/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2016 0, /tp_print/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2017 0, /tp_getattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2018 0, /tp_setattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2019 0, /tp_compare/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2020 none_repr, /tp_repr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2021 0, /tp_as_number/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2022 0, /tp_as_sequence/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2023 0, /tp_as_mapping/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2024 (hashfunc)_Py_HashPointer, /tp_hash /
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2025 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2026
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5006 diff changeset	2027 PyObject _Py_NoneStruct = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41832 diff changeset	2028 _PyObject_EXTRA_INIT
6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41832 diff changeset	2029 1, &PyNone_Type
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2030 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2031
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2032 /* 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	2033 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	2034
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2035 static PyObject *
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2036 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	2037 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2038 return PyString_FromString("NotImplemented");
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2039 }
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2040
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2041 static PyTypeObject PyNotImplemented_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2042 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2043 "NotImplementedType",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2044 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2045 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2046 none_dealloc, /tp_dealloc/ /never called/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2047 0, /tp_print/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2048 0, /tp_getattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2049 0, /tp_setattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2050 0, /tp_compare/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2051 NotImplemented_repr, /tp_repr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2052 0, /tp_as_number/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2053 0, /tp_as_sequence/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2054 0, /tp_as_mapping/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2055 0, /tp_hash /
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2056 };
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2057
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2058 PyObject _Py_NotImplementedStruct = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2059 _PyObject_EXTRA_INIT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2060 1, &PyNotImplemented_Type
15726 db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2061 };
db9f1893be01 Changes for PEP 208. PyObject_Compare has been rewritten. Instances no Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2062
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2063 void
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2064 _Py_ReadyTypes(void)
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2065 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2066 if (PyType_Ready(&PyType_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2067 Py_FatalError("Can't initialize type type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2068
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2069 if (PyType_Ready(&_PyWeakref_RefType) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2070 Py_FatalError("Can't initialize weakref type");
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32463 diff changeset	2071
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2072 if (PyType_Ready(&_PyWeakref_CallableProxyType) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2073 Py_FatalError("Can't initialize callable weakref proxy type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2074
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2075 if (PyType_Ready(&_PyWeakref_ProxyType) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2076 Py_FatalError("Can't initialize weakref proxy type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2077
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2078 if (PyType_Ready(&PyBool_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2079 Py_FatalError("Can't initialize bool type");
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	2080
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2081 if (PyType_Ready(&PyString_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2082 Py_FatalError("Can't initialize str type");
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	2083
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2084 if (PyType_Ready(&PyByteArray_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2085 Py_FatalError("Can't initialize bytearray type");
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	2086
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2087 if (PyType_Ready(&PyList_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2088 Py_FatalError("Can't initialize list type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2089
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2090 if (PyType_Ready(&PyNone_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2091 Py_FatalError("Can't initialize None type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2092
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2093 if (PyType_Ready(&PyNotImplemented_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2094 Py_FatalError("Can't initialize NotImplemented type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2095
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2096 if (PyType_Ready(&PyTraceBack_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2097 Py_FatalError("Can't initialize traceback type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2098
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2099 if (PyType_Ready(&PySuper_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2100 Py_FatalError("Can't initialize super type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2101
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2102 if (PyType_Ready(&PyBaseObject_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2103 Py_FatalError("Can't initialize object type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2104
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2105 if (PyType_Ready(&PyRange_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2106 Py_FatalError("Can't initialize xrange type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2107
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2108 if (PyType_Ready(&PyDict_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2109 Py_FatalError("Can't initialize dict type");
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32463 diff changeset	2110
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2111 if (PyType_Ready(&PySet_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2112 Py_FatalError("Can't initialize set type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2113
77072 d7aff4423172 Issue #8767: Restore building with --disable-unicode. Martin v. Löwis <martin@v.loewis.de> parents: 75102 diff changeset	2114 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2115 if (PyType_Ready(&PyUnicode_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2116 Py_FatalError("Can't initialize unicode type");
77072 d7aff4423172 Issue #8767: Restore building with --disable-unicode. Martin v. Löwis <martin@v.loewis.de> parents: 75102 diff changeset	2117 #endif
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2118
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2119 if (PyType_Ready(&PySlice_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2120 Py_FatalError("Can't initialize slice type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2121
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2122 if (PyType_Ready(&PyStaticMethod_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2123 Py_FatalError("Can't initialize static method type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2124
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2125 #ifndef WITHOUT_COMPLEX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2126 if (PyType_Ready(&PyComplex_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2127 Py_FatalError("Can't initialize complex type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2128 #endif
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	2129
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2130 if (PyType_Ready(&PyFloat_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2131 Py_FatalError("Can't initialize float type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2132
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2133 if (PyType_Ready(&PyBuffer_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2134 Py_FatalError("Can't initialize buffer type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2135
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2136 if (PyType_Ready(&PyLong_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2137 Py_FatalError("Can't initialize long type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2138
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2139 if (PyType_Ready(&PyInt_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2140 Py_FatalError("Can't initialize int type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2141
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2142 if (PyType_Ready(&PyFrozenSet_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2143 Py_FatalError("Can't initialize frozenset type");
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	2144
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2145 if (PyType_Ready(&PyProperty_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2146 Py_FatalError("Can't initialize property type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2147
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	2148 if (PyType_Ready(&PyMemoryView_Type) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	2149 Py_FatalError("Can't initialize memoryview type");
53239 7790b85e7009 try to initalize all builtin types with PyType_Ready to avoid problems like #5787 Benjamin Peterson <benjamin@python.org> parents: 52868 diff changeset	2150
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2151 if (PyType_Ready(&PyTuple_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2152 Py_FatalError("Can't initialize tuple type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2153
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2154 if (PyType_Ready(&PyEnum_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2155 Py_FatalError("Can't initialize enumerate type");
53243 329cb02f18e6 Merged revisions 71722,71725 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 52903 diff changeset	2156
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2157 if (PyType_Ready(&PyReversed_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2158 Py_FatalError("Can't initialize reversed type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2159
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2160 if (PyType_Ready(&PyCode_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2161 Py_FatalError("Can't initialize code type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2162
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2163 if (PyType_Ready(&PyFrame_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2164 Py_FatalError("Can't initialize frame type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2165
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2166 if (PyType_Ready(&PyCFunction_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2167 Py_FatalError("Can't initialize builtin function type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2168
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2169 if (PyType_Ready(&PyMethod_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2170 Py_FatalError("Can't initialize method type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2171
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2172 if (PyType_Ready(&PyFunction_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2173 Py_FatalError("Can't initialize function type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2174
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2175 if (PyType_Ready(&PyClass_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2176 Py_FatalError("Can't initialize class type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2177
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2178 if (PyType_Ready(&PyDictProxy_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2179 Py_FatalError("Can't initialize dict proxy type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2180
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2181 if (PyType_Ready(&PyGen_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2182 Py_FatalError("Can't initialize generator type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2183
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2184 if (PyType_Ready(&PyGetSetDescr_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2185 Py_FatalError("Can't initialize get-set descriptor type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2186
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2187 if (PyType_Ready(&PyWrapperDescr_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2188 Py_FatalError("Can't initialize wrapper type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2189
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2190 if (PyType_Ready(&PyInstance_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2191 Py_FatalError("Can't initialize instance type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2192
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2193 if (PyType_Ready(&PyEllipsis_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2194 Py_FatalError("Can't initialize ellipsis type");
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53243 diff changeset	2195
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2196 if (PyType_Ready(&PyMemberDescr_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2197 Py_FatalError("Can't initialize member descriptor type");
54469 519f80b1f5e3 Uninitialized file type would lead to __exit__ lookup failure when site.py Antoine Pitrou <solipsis@pitrou.net> parents: 54325 diff changeset	2198
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	2199 if (PyType_Ready(&PyFile_Type) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60369 diff changeset	2200 Py_FatalError("Can't initialize file type");
19294 1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2201 }
1456ec735087 Add a function _Py_ReadyTypes() which initializes various and sundry Guido van Rossum <guido@python.org> parents: 19293 diff changeset	2202
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2203
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	2204 #ifdef Py_TRACE_REFS
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2205
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	2206 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2207 _Py_NewReference(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2208 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2209 _Py_INC_REFTOTAL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2210 op->ob_refcnt = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2211 _Py_AddToAllObjects(op, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2212 _Py_INC_TPALLOCS(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2213 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2214
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	2215 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2216 _Py_ForgetReference(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2217 {
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	2218 #ifdef SLOW_UNREF_CHECK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2219 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	2220 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2221 if (op->ob_refcnt < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2222 Py_FatalError("UNREF negative refcnt");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2223 if (op == &refchain \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2224 op->_ob_prev->_ob_next != op \|\| op->_ob_next->_ob_prev != op)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2225 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	2226 #ifdef SLOW_UNREF_CHECK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2227 for (p = refchain._ob_next; p != &refchain; p = p->_ob_next) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2228 if (p == op)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2229 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2230 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2231 if (p == &refchain) /* Not found */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2232 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	2233 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2234 op->_ob_next->_ob_prev = op->_ob_prev;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2235 op->_ob_prev->_ob_next = op->_ob_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2236 op->_ob_next = op->_ob_prev = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2237 _Py_INC_TPFREES(op);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	2238 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	2239
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	2240 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2241 _Py_Dealloc(PyObject *op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 58 diff changeset	2242 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2243 destructor dealloc = Py_TYPE(op)->tp_dealloc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2244 _Py_ForgetReference(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2245 (*dealloc)(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2246 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2247
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	2248 /* 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	2249 * 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	2250 */
4002 4241582636ad Define reference count admin debug functions to return void. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	2251 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2252 _Py_PrintReferences(FILE *fp)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2253 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2254 PyObject *op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2255 fprintf(fp, "Remaining objects:\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2256 for (op = refchain._ob_next; op != &refchain; op = op->_ob_next) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2257 fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] ", op, op->ob_refcnt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2258 if (PyObject_Print(op, fp, 0) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2259 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2260 putc('\n', fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2261 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2262 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2263
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	2264 /* 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	2265 * 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	2266 */
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	2267 void
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	2268 _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	2269 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2270 PyObject *op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2271 fprintf(fp, "Remaining object addresses:\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2272 for (op = refchain._ob_next; op != &refchain; op = op->_ob_next)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2273 fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] %s\n", op,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2274 op->ob_refcnt, Py_TYPE(op)->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	2275 }
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	2276
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	2277 PyObject *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2278 _Py_GetObjects(PyObject self, PyObject args)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	2279 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2280 int i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2281 PyObject *t = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2282 PyObject res, op;
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	2283
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2284 if (!PyArg_ParseTuple(args, "i\|O", &n, &t))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2285 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2286 op = refchain._ob_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2287 res = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2288 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2289 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2290 for (i = 0; (n == 0 \|\| i < n) && op != &refchain; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2291 while (op == self \|\| op == args \|\| op == res \|\| op == t \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2292 (t != NULL && Py_TYPE(op) != (PyTypeObject *) t)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2293 op = op->_ob_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2294 if (op == &refchain)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2295 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2296 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2297 if (PyList_Append(res, op) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2298 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2299 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2300 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2301 op = op->_ob_next;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2302 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2303 return res;
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	2304 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2827 diff changeset	2305
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2306 #endif
3330 9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	2307
9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	2308
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55644 diff changeset	2309 /* Hack to force loading of capsule.o */
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55644 diff changeset	2310 PyTypeObject *_Py_capsule_hack = &PyCapsule_Type;
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55644 diff changeset	2311
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55644 diff changeset	2312
3330 9f1b6e2db8e0 Hack to force loading of cobject.o Guido van Rossum <guido@python.org> parents: 3024 diff changeset	2313 /* Hack to force loading of cobject.o */
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2314 PyTypeObject *_Py_cobject_hack = &PyCObject_Type;
3574 1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	2315
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	2316
1ec154241747 TRACE_REFS -> Py_TRACE_REFS. Guido van Rossum <guido@python.org> parents: 3330 diff changeset	2317 /* 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	2318 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	2319
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2320
14006 ed369f0aa32b Updated comment Andrew M. Kuchling <amk@amk.ca> parents: 13976 diff changeset	2321 /* 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	2322
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	2323 void *
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2324 PyMem_Malloc(size_t nbytes)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2325 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2326 return PyMem_MALLOC(nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2327 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2328
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	2329 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	2330 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	2331 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2332 return PyMem_REALLOC(p, nbytes);
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2333 }
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2334
12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2335 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	2336 PyMem_Free(void *p)
5931 12fe5cc1516d Added _Py_ResetReferences(), if tracing references. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2337 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2338 PyMem_FREE(p);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	2339 }
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	2340
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12481 diff changeset	2341
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2342 /* 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	2343 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	2344 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	2345 Py_ReprLeave() to avoid infinite recursion.
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2346
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2347 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	2348 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	2349 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	2350
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2351 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	2352 */
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2353
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2354 #define KEY "Py_Repr"
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2355
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2356 int
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2357 Py_ReprEnter(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2358 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2359 PyObject *dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2360 PyObject *list;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2361 Py_ssize_t i;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2362
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2363 dict = PyThreadState_GetDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2364 if (dict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2365 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2366 list = PyDict_GetItemString(dict, KEY);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2367 if (list == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2368 list = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2369 if (list == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2370 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2371 if (PyDict_SetItemString(dict, KEY, list) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2372 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2373 Py_DECREF(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2374 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2375 i = PyList_GET_SIZE(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2376 while (--i >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2377 if (PyList_GET_ITEM(list, i) == obj)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2378 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2379 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2380 PyList_Append(list, obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2381 return 0;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2382 }
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2383
1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2384 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2385 Py_ReprLeave(PyObject *obj)
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2386 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2387 PyObject *dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2388 PyObject *list;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2389 Py_ssize_t i;
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2390
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2391 dict = PyThreadState_GetDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2392 if (dict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2393 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2394 list = PyDict_GetItemString(dict, KEY);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2395 if (list == NULL \|\| !PyList_Check(list))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2396 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2397 i = PyList_GET_SIZE(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2398 /* Count backwards because we always expect obj to be list[-1] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2399 while (--i >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2400 if (PyList_GET_ITEM(list, i) == obj) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2401 PyList_SetSlice(list, i, i + 1, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2402 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2403 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2404 }
7984 1d0eb2e96d76 Add implementations of Py_Repr{Enter,Leave}. Guido van Rossum <guido@python.org> parents: 7935 diff changeset	2405 }
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2406
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	2407 /* Trashcan support. */
12052 5d3165e30bce Christian Tismer: Guido van Rossum <guido@python.org> parents: 11999 diff changeset	2408
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	2409 /* 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	2410 int _PyTrash_delete_nesting = 0;
12481 a8898a172fe2 Christian Tismer -- total rewrite on trashcan code. Guido van Rossum <guido@python.org> parents: 12406 diff changeset	2411
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	2412 /* 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	2413 * 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	2414 */
d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	2415 PyObject *_PyTrash_delete_later = NULL;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2416
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	2417 /* 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	2418 * 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	2419 * 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	2420 */
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2421 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2422 _PyTrash_deposit_object(PyObject *op)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2423 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2424 assert(PyObject_IS_GC(op));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2425 assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2426 assert(op->ob_refcnt == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2427 _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *)_PyTrash_delete_later;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2428 _PyTrash_delete_later = op;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2429 }
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2430
78855 5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2431 /* The equivalent API, using per-thread state recursion info */
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2432 void
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2433 _PyTrash_thread_deposit_object(PyObject *op)
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2434 {
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2435 PyThreadState *tstate = PyThreadState_GET();
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2436 assert(PyObject_IS_GC(op));
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2437 assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2438 assert(op->ob_refcnt == 0);
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2439 _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *) tstate->trash_delete_later;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2440 tstate->trash_delete_later = op;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2441 }
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2442
24122 d332484e394a Trashcan cleanup: Now that cyclic gc is always there, the trashcan Tim Peters <tim.peters@gmail.com> parents: 24121 diff changeset	2443 /* 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	2444 * 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	2445 */
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2446 void
13473 31b1f691a7d9 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2447 _PyTrash_destroy_chain(void)
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2448 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2449 while (_PyTrash_delete_later) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2450 PyObject *op = _PyTrash_delete_later;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2451 destructor dealloc = Py_TYPE(op)->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	2452
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2453 _PyTrash_delete_later =
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2454 (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	2455
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2456 /* Call the deallocator directly. This used to try to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2457 * fool Py_DECREF into calling it indirectly, but
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2458 * Py_DECREF was already called on this object, and in
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2459 * assorted non-release builds calling Py_DECREF again ends
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2460 * up distorting allocation statistics.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2461 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2462 assert(op->ob_refcnt == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2463 ++_PyTrash_delete_nesting;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2464 (*dealloc)(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2465 --_PyTrash_delete_nesting;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55645 diff changeset	2466 }
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2467 }
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	2468
78855 5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2469 /* The equivalent API, using per-thread state recursion info */
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2470 void
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2471 _PyTrash_thread_destroy_chain(void)
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2472 {
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2473 PyThreadState *tstate = PyThreadState_GET();
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2474 while (tstate->trash_delete_later) {
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2475 PyObject *op = tstate->trash_delete_later;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2476 destructor dealloc = Py_TYPE(op)->tp_dealloc;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2477
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2478 tstate->trash_delete_later =
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2479 (PyObject*) _Py_AS_GC(op)->gc.gc_prev;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2480
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2481 /* Call the deallocator directly. This used to try to
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2482 * fool Py_DECREF into calling it indirectly, but
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2483 * Py_DECREF was already called on this object, and in
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2484 * assorted non-release builds calling Py_DECREF again ends
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2485 * up distorting allocation statistics.
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2486 */
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2487 assert(op->ob_refcnt == 0);
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2488 ++tstate->trash_delete_nesting;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2489 (*dealloc)(op);
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2490 --tstate->trash_delete_nesting;
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2491 }
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2492 }
5a2ef447b80d Issue #13992: The trashcan mechanism is now thread-safe. This eliminates Antoine Pitrou <solipsis@pitrou.net> parents: 77072 diff changeset	2493
37655 2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	2494 #ifdef __cplusplus
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	2495 }
2f3f2e32dfd9 spread the extern "C" { } magic pixie dust around. Python itself builds now Anthony Baxter <anthonybaxter@gmail.com> parents: 37638 diff changeset	2496 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/object.c @ 79675:c0a2294de787 2.7