cpython-lru_cache-weakref: Python/bltinmodule.c annotate

annotate Python/bltinmodule.c @ 78173:751f28564a45 2.7

Closes #9254: backport __import__ docstring/doc mentions of importlib. Patch by Éric Araujo.

author	R David Murray <rdmurray@bitdance.com>
date	Wed, 18 Jul 2012 19:44:08 -0400
parents	d7aff4423172
children	ba1c48f8b571

rev	line source
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Built-in functions */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	3 #include "Python.h"
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 46107 diff changeset	4 #include "Python-ast.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	5
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	6 #include "node.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35636 diff changeset	7 #include "code.h"
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	8 #include "eval.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	9
5317 c72c7e1930b3 Keep gcc -Wall and Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5223 diff changeset	10 #include <ctype.h>
57324 92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 57306 diff changeset	11 #include <float.h> /* for DBL_MANT_DIG and friends */
5317 c72c7e1930b3 Keep gcc -Wall and Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5223 diff changeset	12
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	13 #ifdef RISCOS
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	14 #include "unixstuff.h"
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	15 #endif
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	16
17822 50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	17 /* The default encoding used by the platform file system APIs
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	18 Can remain NULL for all platforms that don't have such a concept
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	19 */
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23868 diff changeset	20 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
17822 50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	21 const char *Py_FileSystemDefaultEncoding = "mbcs";
27782 904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	22 #elif defined(__APPLE__)
904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	23 const char *Py_FileSystemDefaultEncoding = "utf-8";
17822 50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	24 #else
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	25 const char Py_FileSystemDefaultEncoding = NULL; / use default */
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	26 #endif
17817 f7c385226f65 Add support for Windows using "mbcs" as the default Unicode encoding when dealing with the file system. As discussed on python-dev and in patch 410465. Mark Hammond <mhammond@skippinet.com.au> parents: 17694 diff changeset	27
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	28 /* Forward */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13446 diff changeset	29 static PyObject filterstring(PyObject , PyObject *);
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	30 #ifdef Py_USING_UNICODE
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	31 static PyObject filterunicode(PyObject , PyObject *);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	32 #endif
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13446 diff changeset	33 static PyObject filtertuple (PyObject , PyObject *);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	34
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	35 static PyObject *
37411 ea9a03b8b9f6 Accept keyword arguments for __import__ and doc the addition of the level param from PEP 328. Neal Norwitz <nnorwitz@gmail.com> parents: 37344 diff changeset	36 builtin___import__(PyObject self, PyObject args, PyObject *kwds)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	37 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	38 static char *kwlist[] = {"name", "globals", "locals", "fromlist",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	39 "level", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	40 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	41 PyObject *globals = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	42 PyObject *locals = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	43 PyObject *fromlist = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	44 int level = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	45
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	46 if (!PyArg_ParseTupleAndKeywords(args, kwds, "s\|OOOi:__import__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	47 kwlist, &name, &globals, &locals, &fromlist, &level))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	48 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	49 return PyImport_ImportModuleLevel(name, globals, locals,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	50 fromlist, level);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	51 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	52
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	53 PyDoc_STRVAR(import_doc,
37411 ea9a03b8b9f6 Accept keyword arguments for __import__ and doc the addition of the level param from PEP 328. Neal Norwitz <nnorwitz@gmail.com> parents: 37344 diff changeset	54 "__import__(name, globals={}, locals={}, fromlist=[], level=-1) -> module\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	55 \n\
78173 751f28564a45 Closes #9254: backport __import__ docstring/doc mentions of importlib. R David Murray <rdmurray@bitdance.com> parents: 77072 diff changeset	56 Import a module. Because this function is meant for use by the Python\n\
751f28564a45 Closes #9254: backport __import__ docstring/doc mentions of importlib. R David Murray <rdmurray@bitdance.com> parents: 77072 diff changeset	57 interpreter and not for general use it is better to use\n\
751f28564a45 Closes #9254: backport __import__ docstring/doc mentions of importlib. R David Murray <rdmurray@bitdance.com> parents: 77072 diff changeset	58 importlib.import_module() to programmatically import a module.\n\
751f28564a45 Closes #9254: backport __import__ docstring/doc mentions of importlib. R David Murray <rdmurray@bitdance.com> parents: 77072 diff changeset	59 \n\
751f28564a45 Closes #9254: backport __import__ docstring/doc mentions of importlib. R David Murray <rdmurray@bitdance.com> parents: 77072 diff changeset	60 The globals argument is only used to determine the context;\n\
751f28564a45 Closes #9254: backport __import__ docstring/doc mentions of importlib. R David Murray <rdmurray@bitdance.com> parents: 77072 diff changeset	61 they are not modified. The locals argument is unused. The fromlist\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	62 should be a list of names to emulate ``from name import ...'', or an\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	63 empty list to emulate ``import name''.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	64 When importing a module from a package, note that __import__('A.B', ...)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	65 returns package A when fromlist is empty, but its submodule B when\n\
37411 ea9a03b8b9f6 Accept keyword arguments for __import__ and doc the addition of the level param from PEP 328. Neal Norwitz <nnorwitz@gmail.com> parents: 37344 diff changeset	66 fromlist is not empty. Level is used to determine whether to perform \n\
ea9a03b8b9f6 Accept keyword arguments for __import__ and doc the addition of the level param from PEP 328. Neal Norwitz <nnorwitz@gmail.com> parents: 37344 diff changeset	67 absolute or relative imports. -1 is the original strategy of attempting\n\
ea9a03b8b9f6 Accept keyword arguments for __import__ and doc the addition of the level param from PEP 328. Neal Norwitz <nnorwitz@gmail.com> parents: 37344 diff changeset	68 both absolute and relative imports, 0 is absolute, a positive number\n\
ea9a03b8b9f6 Accept keyword arguments for __import__ and doc the addition of the level param from PEP 328. Neal Norwitz <nnorwitz@gmail.com> parents: 37344 diff changeset	69 is the number of parent directories to search relative to the current module.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	70
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	71
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	72 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	73 builtin_abs(PyObject self, PyObject v)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	74 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	75 return PyNumber_Absolute(v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	76 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	77
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	78 PyDoc_STRVAR(abs_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	79 "abs(number) -> number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	80 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	81 Return the absolute value of the argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	82
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	83 static PyObject *
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	84 builtin_all(PyObject self, PyObject v)
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	85 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	86 PyObject it, item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	87 PyObject (iternext)(PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	88 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	89
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	90 it = PyObject_GetIter(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	91 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	92 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	93 iternext = *Py_TYPE(it)->tp_iternext;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	94
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	95 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	96 item = iternext(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	97 if (item == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	98 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	99 cmp = PyObject_IsTrue(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	100 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	101 if (cmp < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	102 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	103 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	104 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	105 if (cmp == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	106 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	107 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	108 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	109 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	110 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	111 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	112 if (PyErr_ExceptionMatches(PyExc_StopIteration))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	113 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	114 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	115 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	116 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	117 Py_RETURN_TRUE;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	118 }
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	119
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	120 PyDoc_STRVAR(all_doc,
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	121 "all(iterable) -> bool\n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	122 \n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	123 Return True if bool(x) is True for all values x in the iterable.");
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	124
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	125 static PyObject *
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	126 builtin_any(PyObject self, PyObject v)
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	127 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	128 PyObject it, item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	129 PyObject (iternext)(PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	130 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	131
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	132 it = PyObject_GetIter(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	133 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	134 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	135 iternext = *Py_TYPE(it)->tp_iternext;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	136
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	137 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	138 item = iternext(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	139 if (item == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	140 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	141 cmp = PyObject_IsTrue(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	142 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	143 if (cmp < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	144 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	145 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	146 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	147 if (cmp == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	148 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	149 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	150 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	151 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	152 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	153 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	154 if (PyErr_ExceptionMatches(PyExc_StopIteration))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	155 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	156 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	157 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	158 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	159 Py_RETURN_FALSE;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	160 }
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	161
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	162 PyDoc_STRVAR(any_doc,
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	163 "any(iterable) -> bool\n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	164 \n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	165 Return True if bool(x) is True for any x in the iterable.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	166
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	167 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	168 builtin_apply(PyObject self, PyObject args)
480 c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	169 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	170 PyObject func, alist = NULL, *kwdict = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	171 PyObject t = NULL, retval = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	172
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	173 if (PyErr_WarnPy3k("apply() not supported in 3.x; "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	174 "use func(args, *kwargs)", 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	175 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	176
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	177 if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	178 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	179 if (alist != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	180 if (!PyTuple_Check(alist)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	181 if (!PySequence_Check(alist)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	182 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	183 "apply() arg 2 expected sequence, found %s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	184 alist->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	185 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	186 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	187 t = PySequence_Tuple(alist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	188 if (t == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	189 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	190 alist = t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	191 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	192 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	193 if (kwdict != NULL && !PyDict_Check(kwdict)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	194 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	195 "apply() arg 3 expected dictionary, found %s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	196 kwdict->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	197 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	198 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	199 retval = PyEval_CallObjectWithKeywords(func, alist, kwdict);
9188 a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	200 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	201 Py_XDECREF(t);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	202 return retval;
480 c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	203 }
c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	204
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	205 PyDoc_STRVAR(apply_doc,
15832 0ae389e935fc Update the docstring for apply() so that "args" is marked as optional Fred Drake <fdrake@acm.org> parents: 15829 diff changeset	206 "apply(object[, args[, kwargs]]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	207 \n\
11621 0ec803cbd872 Adjusted apply() docstring based on comments from Gerrit Holl Fred Drake <fdrake@acm.org> parents: 11383 diff changeset	208 Call a callable object with positional arguments taken from the tuple args,\n\
0ec803cbd872 Adjusted apply() docstring based on comments from Gerrit Holl Fred Drake <fdrake@acm.org> parents: 11383 diff changeset	209 and keyword arguments taken from the optional dictionary kwargs.\n\
28513 90c77b8af1a4 SF patch #701494: more apply removals Raymond Hettinger <python@rcn.com> parents: 28396 diff changeset	210 Note that classes are callable, as are instances with a __call__() method.\n\
90c77b8af1a4 SF patch #701494: more apply removals Raymond Hettinger <python@rcn.com> parents: 28396 diff changeset	211 \n\
90c77b8af1a4 SF patch #701494: more apply removals Raymond Hettinger <python@rcn.com> parents: 28396 diff changeset	212 Deprecated since release 2.3. Instead, use the extended call syntax:\n\
90c77b8af1a4 SF patch #701494: more apply removals Raymond Hettinger <python@rcn.com> parents: 28396 diff changeset	213 function(args, *keywords).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	214
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	215
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	216 static PyObject *
45433 4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	217 builtin_bin(PyObject self, PyObject v)
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	218 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	219 return PyNumber_ToBase(v, 2);
45433 4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	220 }
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	221
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	222 PyDoc_STRVAR(bin_doc,
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	223 "bin(number) -> string\n\
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	224 \n\
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	225 Return the binary representation of an integer or long integer.");
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	226
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	227
4a9522fd75a6 Added bin() builtin. I'm going to check in the tests in a seperate checkin, because the builtin doesn't need to be ported to py3k, but the tests are missing in py3k and need to be merged there. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	228 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	229 builtin_callable(PyObject self, PyObject v)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	230 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	231 return PyBool_FromLong((long)PyCallable_Check(v));
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	232 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	233
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	234 PyDoc_STRVAR(callable_doc,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22205 diff changeset	235 "callable(object) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	236 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	237 Return whether the object is callable (i.e., some kind of function).\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	238 Note that classes are callable, as are instances with a __call__() method.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	239
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	240
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	241 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	242 builtin_filter(PyObject self, PyObject args)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	243 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	244 PyObject func, seq, result, it, *arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	245 Py_ssize_t len; /* guess for result list size */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	246 register Py_ssize_t j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	247
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	248 if (!PyArg_UnpackTuple(args, "filter", 2, 2, &func, &seq))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	249 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	250
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	251 /* Strings and tuples return a result of the same type. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	252 if (PyString_Check(seq))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	253 return filterstring(func, seq);
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	254 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	255 if (PyUnicode_Check(seq))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	256 return filterunicode(func, seq);
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	257 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	258 if (PyTuple_Check(seq))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	259 return filtertuple(func, seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	260
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	261 /* Pre-allocate argument list tuple. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	262 arg = PyTuple_New(1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	263 if (arg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	264 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	265
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	266 /* Get iterator. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	267 it = PyObject_GetIter(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	268 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	269 goto Fail_arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	270
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	271 /* Guess a result list size. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	272 len = _PyObject_LengthHint(seq, 8);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	273 if (len == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	274 goto Fail_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	275
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	276 /* Get a result list. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	277 if (PyList_Check(seq) && seq->ob_refcnt == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	278 /* Eww - can modify the list in-place. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	279 Py_INCREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	280 result = seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	281 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	282 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	283 result = PyList_New(len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	284 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	285 goto Fail_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	286 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	287
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	288 /* Build the result list. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	289 j = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	290 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	291 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	292 int ok;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	293
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	294 item = PyIter_Next(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	295 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	296 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	297 goto Fail_result_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	298 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	299 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	300
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	301 if (func == (PyObject *)&PyBool_Type \|\| func == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	302 ok = PyObject_IsTrue(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	303 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	304 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	305 PyObject *good;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	306 PyTuple_SET_ITEM(arg, 0, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	307 good = PyObject_Call(func, arg, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	308 PyTuple_SET_ITEM(arg, 0, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	309 if (good == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	310 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	311 goto Fail_result_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	312 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	313 ok = PyObject_IsTrue(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	314 Py_DECREF(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	315 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	316 if (ok) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	317 if (j < len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	318 PyList_SET_ITEM(result, j, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	319 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	320 int status = PyList_Append(result, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	321 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	322 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	323 goto Fail_result_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	324 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	325 ++j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	326 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	327 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	328 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	329 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	330
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	331
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	332 /* Cut back result list if len is too big. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	333 if (j < len && PyList_SetSlice(result, j, len, NULL) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	334 goto Fail_result_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	335
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	336 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	337 Py_DECREF(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	338 return result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	339
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	340 Fail_result_it:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	341 Py_DECREF(result);
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	342 Fail_it:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	343 Py_DECREF(it);
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	344 Fail_arg:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	345 Py_DECREF(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	346 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	347 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	348
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	349 PyDoc_STRVAR(filter_doc,
22225 67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	350 "filter(function or None, sequence) -> list, tuple, or string\n"
67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	351 "\n"
67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	352 "Return those items of sequence for which function(item) is true. If\n"
67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	353 "function is None, return the items that are true. If sequence is a tuple\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	354 "or string, return the same type, else return a list.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	355
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	356 static PyObject *
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	357 builtin_format(PyObject self, PyObject args)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	358 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	359 PyObject *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	360 PyObject *format_spec = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	361
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	362 if (!PyArg_ParseTuple(args, "O\|O:format", &value, &format_spec))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	363 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	364
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	365 return PyObject_Format(value, format_spec);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	366 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	367
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	368 PyDoc_STRVAR(format_doc,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	369 "format(value[, format_spec]) -> string\n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	370 \n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	371 Returns value.__format__(format_spec)\n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	372 format_spec defaults to \"\"");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	373
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45079 diff changeset	374 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	375 builtin_chr(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	376 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	377 long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	378 char s[1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	379
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	380 if (!PyArg_ParseTuple(args, "l:chr", &x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	381 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	382 if (x < 0 \|\| x >= 256) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	383 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	384 "chr() arg not in range(256)");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	385 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	386 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	387 s[0] = (char)x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	388 return PyString_FromStringAndSize(s, 1);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	389 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	390
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	391 PyDoc_STRVAR(chr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	392 "chr(i) -> character\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	393 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	394 Return a string of one character with ordinal i; 0 <= i < 256.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	395
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	396
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	397 #ifdef Py_USING_UNICODE
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	398 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	399 builtin_unichr(PyObject self, PyObject args)
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	400 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	401 int x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	402
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	403 if (!PyArg_ParseTuple(args, "i:unichr", &x))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	404 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	405
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	406 return PyUnicode_FromOrdinal(x);
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	407 }
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	408
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	409 PyDoc_STRVAR(unichr_doc,
12386 32e9d0e78935 When refering to Unicode characters in exception messages and Fred Drake <fdrake@acm.org> parents: 12384 diff changeset	410 "unichr(i) -> Unicode character\n\
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	411 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	412 Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff.");
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	413 #endif
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	414
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	415
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	416 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	417 builtin_cmp(PyObject self, PyObject args)
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	418 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	419 PyObject a, b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	420 int c;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	421
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	422 if (!PyArg_UnpackTuple(args, "cmp", 2, 2, &a, &b))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	423 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	424 if (PyObject_Cmp(a, b, &c) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	425 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	426 return PyInt_FromLong((long)c);
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	427 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	428
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	429 PyDoc_STRVAR(cmp_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	430 "cmp(x, y) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	431 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	432 Return negative if x<y, zero if x==y, positive if x>y.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	433
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	434
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	435 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	436 builtin_coerce(PyObject self, PyObject args)
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2106 diff changeset	437 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	438 PyObject v, w;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	439 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	440
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	441 if (PyErr_WarnPy3k("coerce() not supported in 3.x", 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	442 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	443
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	444 if (!PyArg_UnpackTuple(args, "coerce", 2, 2, &v, &w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	445 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	446 if (PyNumber_Coerce(&v, &w) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	447 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	448 res = PyTuple_Pack(2, v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	449 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	450 Py_DECREF(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	451 return res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	452 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	453
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	454 PyDoc_STRVAR(coerce_doc,
33261 1cf7d7225a99 Patch #1015021: Stop claiming that coerce can return None. Martin v. Löwis <martin@v.loewis.de> parents: 33099 diff changeset	455 "coerce(x, y) -> (x1, y1)\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	456 \n\
33261 1cf7d7225a99 Patch #1015021: Stop claiming that coerce can return None. Martin v. Löwis <martin@v.loewis.de> parents: 33099 diff changeset	457 Return a tuple consisting of the two numeric arguments converted to\n\
1cf7d7225a99 Patch #1015021: Stop claiming that coerce can return None. Martin v. Löwis <martin@v.loewis.de> parents: 33099 diff changeset	458 a common type, using the same rules as used by arithmetic operations.\n\
1cf7d7225a99 Patch #1015021: Stop claiming that coerce can return None. Martin v. Löwis <martin@v.loewis.de> parents: 33099 diff changeset	459 If coercion is not possible, raise TypeError.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	460
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	461 static PyObject *
41168 78686c7a23a7 Patch #1444529: the builtin compile() now accepts keyword arguments. Georg Brandl <georg@python.org> parents: 41140 diff changeset	462 builtin_compile(PyObject self, PyObject args, PyObject *kwds)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	463 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	464 char *str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	465 char *filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	466 char *startstr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	467 int mode = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	468 int dont_inherit = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	469 int supplied_flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	470 int is_ast;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	471 PyCompilerFlags cf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	472 PyObject result = NULL, cmd, *tmp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	473 Py_ssize_t length;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	474 static char *kwlist[] = {"source", "filename", "mode", "flags",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	475 "dont_inherit", NULL};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	476 int start[] = {Py_file_input, Py_eval_input, Py_single_input};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	477
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	478 if (!PyArg_ParseTupleAndKeywords(args, kwds, "Oss\|ii:compile",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	479 kwlist, &cmd, &filename, &startstr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	480 &supplied_flags, &dont_inherit))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	481 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	482
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	483 cf.cf_flags = supplied_flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	484
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	485 if (supplied_flags &
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	486 ~(PyCF_MASK \| PyCF_MASK_OBSOLETE \| PyCF_DONT_IMPLY_DEDENT \| PyCF_ONLY_AST))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	487 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	488 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	489 "compile(): unrecognised flags");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	490 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	491 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	492 /* XXX Warn if (supplied_flags & PyCF_MASK_OBSOLETE) != 0? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	493
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	494 if (!dont_inherit) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	495 PyEval_MergeCompilerFlags(&cf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	496 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	497
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	498 if (strcmp(startstr, "exec") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	499 mode = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	500 else if (strcmp(startstr, "eval") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	501 mode = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	502 else if (strcmp(startstr, "single") == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	503 mode = 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	504 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	505 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	506 "compile() arg 3 must be 'exec', 'eval' or 'single'");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	507 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	508 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	509
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	510 is_ast = PyAST_Check(cmd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	511 if (is_ast == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	512 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	513 if (is_ast) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	514 if (supplied_flags & PyCF_ONLY_AST) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	515 Py_INCREF(cmd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	516 result = cmd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	517 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	518 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	519 PyArena *arena;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	520 mod_ty mod;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	521
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	522 arena = PyArena_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	523 mod = PyAST_obj2mod(cmd, arena, mode);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	524 if (mod == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	525 PyArena_Free(arena);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	526 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	527 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	528 result = (PyObject*)PyAST_Compile(mod, filename,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	529 &cf, arena);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	530 PyArena_Free(arena);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	531 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	532 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	533 }
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	534
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	535 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	536 if (PyUnicode_Check(cmd)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	537 tmp = PyUnicode_AsUTF8String(cmd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	538 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	539 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	540 cmd = tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	541 cf.cf_flags \|= PyCF_SOURCE_IS_UTF8;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	542 }
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	543 #endif
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	544
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	545 if (PyObject_AsReadBuffer(cmd, (const void **)&str, &length))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	546 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	547 if ((size_t)length != strlen(str)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	548 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	549 "compile() expected string without null bytes");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	550 goto cleanup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	551 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	552 result = Py_CompileStringFlags(str, filename, start[mode], &cf);
35960 658444baeba3 Fix memory leaks Neal Norwitz <nnorwitz@gmail.com> parents: 35766 diff changeset	553 cleanup:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	554 Py_XDECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	555 return result;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	556 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	557
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	558 PyDoc_STRVAR(compile_doc,
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	559 "compile(source, filename, mode[, flags[, dont_inherit]]) -> code object\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	560 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	561 Compile the source string (a Python module, statement or expression)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	562 into a code object that can be executed by the exec statement or eval().\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	563 The filename will be used for run-time error messages.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	564 The mode must be 'exec' to compile a module, 'single' to compile a\n\
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	565 single (interactive) statement, or 'eval' to compile an expression.\n\
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	566 The flags argument, if present, controls which future statements influence\n\
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	567 the compilation of the code.\n\
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	568 The dont_inherit argument, if non-zero, stops the compilation inheriting\n\
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	569 the effects of any future statements in effect in the code calling\n\
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	570 compile; if absent or zero these statements do influence the compilation,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	571 in addition to any features explicitly specified.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	572
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	573 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	574 builtin_dir(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	575 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	576 PyObject *arg = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	577
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	578 if (!PyArg_UnpackTuple(args, "dir", 0, 1, &arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	579 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	580 return PyObject_Dir(arg);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	581 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	582
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	583 PyDoc_STRVAR(dir_doc,
19665 08c3c9edd99b Make dir() wordier (see the new docstring). The new behavior is a mixed Tim Peters <tim.peters@gmail.com> parents: 19471 diff changeset	584 "dir([object]) -> list of strings\n"
08c3c9edd99b Make dir() wordier (see the new docstring). The new behavior is a mixed Tim Peters <tim.peters@gmail.com> parents: 19471 diff changeset	585 "\n"
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	586 "If called without an argument, return the names in the current scope.\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	587 "Else, return an alphabetized list of names comprising (some of) the attributes\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	588 "of the given object, and of attributes reachable from it.\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	589 "If the object supplies a method named __dir__, it will be used; otherwise\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	590 "the default dir() logic is used and returns:\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	591 " for a module object: the module's attributes.\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	592 " for a class object: its attributes, and recursively the attributes\n"
717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	593 " of its bases.\n"
41140 7286d832ad27 Typo and grammar fixes. Georg Brandl <georg@python.org> parents: 41125 diff changeset	594 " for any other object: its attributes, its class's attributes, and\n"
41125 717bc2a4eee7 Backport from Py3k branch: Georg Brandl <georg@python.org> parents: 40113 diff changeset	595 " recursively the attributes of its class's base classes.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	596
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	597 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	598 builtin_divmod(PyObject self, PyObject args)
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	599 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	600 PyObject v, w;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	601
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	602 if (!PyArg_UnpackTuple(args, "divmod", 2, 2, &v, &w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	603 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	604 return PyNumber_Divmod(v, w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	605 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	606
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	607 PyDoc_STRVAR(divmod_doc,
71422 b57ace63286b Improve docstring for divmod() Raymond Hettinger <python@rcn.com> parents: 71248 diff changeset	608 "divmod(x, y) -> (quotient, remainder)\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	609 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	610 Return the tuple ((x-x%y)/y, x%y). Invariant: div*y + mod == x.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	611
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	612
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	613 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	614 builtin_eval(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	615 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	616 PyObject cmd, result, *tmp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	617 PyObject globals = Py_None, locals = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	618 char *str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	619 PyCompilerFlags cf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	620
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	621 if (!PyArg_UnpackTuple(args, "eval", 1, 3, &cmd, &globals, &locals))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	622 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	623 if (locals != Py_None && !PyMapping_Check(locals)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	624 PyErr_SetString(PyExc_TypeError, "locals must be a mapping");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	625 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	626 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	627 if (globals != Py_None && !PyDict_Check(globals)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	628 PyErr_SetString(PyExc_TypeError, PyMapping_Check(globals) ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	629 "globals must be a real dict; try eval(expr, {}, mapping)"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	630 : "globals must be a dict");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	631 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	632 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	633 if (globals == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	634 globals = PyEval_GetGlobals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	635 if (locals == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	636 locals = PyEval_GetLocals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	637 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	638 else if (locals == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	639 locals = globals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	640
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	641 if (globals == NULL \|\| locals == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	642 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	643 "eval must be given globals and locals "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	644 "when called without a frame");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	645 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	646 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	647
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	648 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	649 if (PyDict_SetItemString(globals, "__builtins__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	650 PyEval_GetBuiltins()) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	651 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	652 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	653
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	654 if (PyCode_Check(cmd)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	655 if (PyCode_GetNumFree((PyCodeObject *)cmd) > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	656 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	657 "code object passed to eval() may not contain free variables");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	658 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	659 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	660 return PyEval_EvalCode((PyCodeObject *) cmd, globals, locals);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	661 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	662
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	663 if (!PyString_Check(cmd) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	664 !PyUnicode_Check(cmd)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	665 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	666 "eval() arg 1 must be a string or code object");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	667 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	668 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	669 cf.cf_flags = 0;
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	670
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	671 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	672 if (PyUnicode_Check(cmd)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	673 tmp = PyUnicode_AsUTF8String(cmd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	674 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	675 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	676 cmd = tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	677 cf.cf_flags \|= PyCF_SOURCE_IS_UTF8;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	678 }
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	679 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	680 if (PyString_AsStringAndSize(cmd, &str, NULL)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	681 Py_XDECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	682 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	683 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	684 while (str == ' ' \|\| str == '\t')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	685 str++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	686
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	687 (void)PyEval_MergeCompilerFlags(&cf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	688 result = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	689 Py_XDECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	690 return result;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	691 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	692
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	693 PyDoc_STRVAR(eval_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	694 "eval(source[, globals[, locals]]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	695 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	696 Evaluate the source in the context of globals and locals.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	697 The source may be a string representing a Python expression\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	698 or a code object as returned by compile().\n\
39746 97d3eab8cda2 Fix SF #1552093, eval docstring typo (3 ps in mapping) Neal Norwitz <nnorwitz@gmail.com> parents: 39447 diff changeset	699 The globals must be a dictionary and locals can be any mapping,\n\
32463 d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 31837 diff changeset	700 defaulting to the current globals and locals.\n\
d4a59230e93a SF Bug #215126: Over restricted type checking on eval() function Raymond Hettinger <python@rcn.com> parents: 31837 diff changeset	701 If only globals is given, locals defaults to it.\n");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	702
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	703
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	704 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	705 builtin_execfile(PyObject self, PyObject args)
673 71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	706 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	707 char *filename;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	708 PyObject globals = Py_None, locals = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	709 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	710 FILE* fp = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	711 PyCompilerFlags cf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	712 int exists;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	713
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	714 if (PyErr_WarnPy3k("execfile() not supported in 3.x; use exec()",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	715 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	716 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	717
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	718 if (!PyArg_ParseTuple(args, "s\|O!O:execfile",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	719 &filename,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	720 &PyDict_Type, &globals,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	721 &locals))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	722 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	723 if (locals != Py_None && !PyMapping_Check(locals)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	724 PyErr_SetString(PyExc_TypeError, "locals must be a mapping");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	725 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	726 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	727 if (globals == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	728 globals = PyEval_GetGlobals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	729 if (locals == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	730 locals = PyEval_GetLocals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	731 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	732 else if (locals == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	733 locals = globals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	734 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	735 if (PyDict_SetItemString(globals, "__builtins__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	736 PyEval_GetBuiltins()) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	737 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	738 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	739
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	740 exists = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	741 /* Test for existence or directory. */
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	742 #if defined(PLAN9)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	743 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	744 Dir *d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	745
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	746 if ((d = dirstat(filename))!=nil) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	747 if(d->mode & DMDIR)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	748 werrstr("is a directory");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	749 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	750 exists = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	751 free(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	752 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	753 }
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	754 #elif defined(RISCOS)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	755 if (object_exists(filename)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	756 if (isdir(filename))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	757 errno = EISDIR;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	758 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	759 exists = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	760 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	761 #else /* standard Posix */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	762 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	763 struct stat s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	764 if (stat(filename, &s) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	765 if (S_ISDIR(s.st_mode))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	766 # if defined(PYOS_OS2) && defined(PYCC_VACPP)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	767 errno = EOS2ERR;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	768 # else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	769 errno = EISDIR;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	770 # endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	771 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	772 exists = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	773 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	774 }
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	775 #endif
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	776
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	777 if (exists) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	778 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	779 fp = fopen(filename, "r" PY_STDIOTEXTMODE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	780 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	781
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	782 if (fp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	783 exists = 0;
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	784 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	785 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	786
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	787 if (!exists) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	788 PyErr_SetFromErrnoWithFilename(PyExc_IOError, filename);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	789 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	790 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	791 cf.cf_flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	792 if (PyEval_MergeCompilerFlags(&cf))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	793 res = PyRun_FileExFlags(fp, filename, Py_file_input, globals,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	794 locals, 1, &cf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	795 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	796 res = PyRun_FileEx(fp, filename, Py_file_input, globals,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	797 locals, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	798 return res;
673 71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	799 }
71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	800
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	801 PyDoc_STRVAR(execfile_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	802 "execfile(filename[, globals[, locals]])\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	803 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	804 Read and execute a Python script from a file.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	805 The globals and locals are dictionaries, defaulting to the current\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	806 globals and locals. If only globals is given, locals defaults to it.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	807
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	808
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	809 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	810 builtin_getattr(PyObject self, PyObject args)
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	811 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	812 PyObject v, result, *dflt = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	813 PyObject *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	814
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	815 if (!PyArg_UnpackTuple(args, "getattr", 2, 3, &v, &name, &dflt))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	816 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	817 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	818 if (PyUnicode_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	819 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	820 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	821 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	822 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	823 #endif
18888 f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	824
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	825 if (!PyString_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	826 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	827 "getattr(): attribute name must be string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	828 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	829 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	830 result = PyObject_GetAttr(v, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	831 if (result == NULL && dflt != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	832 PyErr_ExceptionMatches(PyExc_AttributeError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	833 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	834 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	835 Py_INCREF(dflt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	836 result = dflt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	837 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	838 return result;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	839 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	840
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	841 PyDoc_STRVAR(getattr_doc,
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	842 "getattr(object, name[, default]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	843 \n\
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	844 Get a named attribute from an object; getattr(x, 'y') is equivalent to x.y.\n\
221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	845 When a default argument is given, it is returned when the attribute doesn't\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	846 exist; without it, an exception is raised in that case.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	847
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	848
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	849 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	850 builtin_globals(PyObject *self)
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	851 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	852 PyObject *d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	853
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	854 d = PyEval_GetGlobals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	855 Py_XINCREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	856 return d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	857 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	858
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	859 PyDoc_STRVAR(globals_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	860 "globals() -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	861 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	862 Return the dictionary containing the current scope's global variables.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	863
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	864
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	865 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	866 builtin_hasattr(PyObject self, PyObject args)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	867 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	868 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	869 PyObject *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	870
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	871 if (!PyArg_UnpackTuple(args, "hasattr", 2, 2, &v, &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	872 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	873 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	874 if (PyUnicode_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	875 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	876 if (name == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	877 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	878 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	879 #endif
18890 fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	880
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	881 if (!PyString_Check(name)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	882 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	883 "hasattr(): attribute name must be string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	884 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	885 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	886 v = PyObject_GetAttr(v, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	887 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	888 if (!PyErr_ExceptionMatches(PyExc_Exception))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	889 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	890 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	891 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	892 Py_INCREF(Py_False);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	893 return Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	894 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	895 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	896 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	897 Py_INCREF(Py_True);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	898 return Py_True;
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	899 }
59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	900
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	901 PyDoc_STRVAR(hasattr_doc,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22205 diff changeset	902 "hasattr(object, name) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	903 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	904 Return whether the object has an attribute with the given name.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	905 (This is done by calling getattr(object, name) and catching exceptions.)");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	906
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	907
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	908 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	909 builtin_id(PyObject self, PyObject v)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	910 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	911 return PyLong_FromVoidPtr(v);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	912 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	913
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	914 PyDoc_STRVAR(id_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	915 "id(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	916 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	917 Return the identity of an object. This is guaranteed to be unique among\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	918 simultaneously existing objects. (Hint: it's the object's memory address.)");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	919
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	920
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	921 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	922 builtin_map(PyObject self, PyObject args)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	923 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	924 typedef struct {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	925 PyObject it; / the iterator object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	926 int saw_StopIteration; /* bool: did the iterator end? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	927 } sequence;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	928
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	929 PyObject func, result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	930 sequence seqs = NULL, sqp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	931 Py_ssize_t n, len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	932 register int i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	933
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	934 n = PyTuple_Size(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	935 if (n < 2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	936 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	937 "map() requires at least two args");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	938 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	939 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	940
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	941 func = PyTuple_GetItem(args, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	942 n--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	943
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	944 if (func == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	945 if (PyErr_WarnPy3k("map(None, ...) not supported in 3.x; "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	946 "use list(...)", 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	947 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	948 if (n == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	949 /* map(None, S) is the same as list(S). */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	950 return PySequence_List(PyTuple_GetItem(args, 1));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	951 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	952 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	953
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	954 /* Get space for sequence descriptors. Must NULL out the iterator
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	955 * pointers so that jumping to Fail_2 later doesn't see trash.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	956 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	957 if ((seqs = PyMem_NEW(sequence, n)) == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	958 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	959 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	960 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	961 for (i = 0; i < n; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	962 seqs[i].it = (PyObject*)NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	963 seqs[i].saw_StopIteration = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	964 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	965
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	966 /* Do a first pass to obtain iterators for the arguments, and set len
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	967 * to the largest of their lengths.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	968 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	969 len = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	970 for (i = 0, sqp = seqs; i < n; ++i, ++sqp) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	971 PyObject *curseq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	972 Py_ssize_t curlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	973
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	974 /* Get iterator. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	975 curseq = PyTuple_GetItem(args, i+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	976 sqp->it = PyObject_GetIter(curseq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	977 if (sqp->it == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	978 static char errmsg[] =
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	979 "argument %d to map() must support iteration";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	980 char errbuf[sizeof(errmsg) + 25];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	981 PyOS_snprintf(errbuf, sizeof(errbuf), errmsg, i+2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	982 PyErr_SetString(PyExc_TypeError, errbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	983 goto Fail_2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	984 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	985
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	986 /* Update len. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	987 curlen = _PyObject_LengthHint(curseq, 8);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	988 if (curlen > len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	989 len = curlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	990 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	991
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	992 /* Get space for the result list. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	993 if ((result = (PyObject *) PyList_New(len)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	994 goto Fail_2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	995
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	996 /* Iterate over the sequences until all have stopped. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	997 for (i = 0; ; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	998 PyObject alist, item=NULL, *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	999 int numactive = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1000
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1001 if (func == Py_None && n == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1002 alist = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1003 else if ((alist = PyTuple_New(n)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1004 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1005
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1006 for (j = 0, sqp = seqs; j < n; ++j, ++sqp) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1007 if (sqp->saw_StopIteration) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1008 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1009 item = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1010 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1011 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1012 item = PyIter_Next(sqp->it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1013 if (item)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1014 ++numactive;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1015 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1016 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1017 Py_XDECREF(alist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1018 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1019 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1020 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1021 item = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1022 sqp->saw_StopIteration = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1023 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1024 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1025 if (alist)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1026 PyTuple_SET_ITEM(alist, j, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1027 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1028 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1029 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1030
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1031 if (!alist)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1032 alist = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1033
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1034 if (numactive == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1035 Py_DECREF(alist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1036 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1037 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1038
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1039 if (func == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1040 value = alist;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1041 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1042 value = PyEval_CallObject(func, alist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1043 Py_DECREF(alist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1044 if (value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1045 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1046 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1047 if (i >= len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1048 int status = PyList_Append(result, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1049 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1050 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1051 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1052 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1053 else if (PyList_SetItem(result, i, value) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1054 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1055 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1056
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1057 if (i < len && PyList_SetSlice(result, i, len, NULL) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1058 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1059
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1060 goto Succeed;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1061
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1062 Fail_1:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1063 Py_DECREF(result);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1064 Fail_2:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1065 result = NULL;
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	1066 Succeed:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1067 assert(seqs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1068 for (i = 0; i < n; ++i)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1069 Py_XDECREF(seqs[i].it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1070 PyMem_DEL(seqs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1071 return result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1072 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1073
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1074 PyDoc_STRVAR(map_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1075 "map(function, sequence[, sequence, ...]) -> list\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1076 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1077 Return a list of the results of applying the function to the items of\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1078 the argument sequence(s). If more than one sequence is given, the\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1079 function is called with an argument list consisting of the corresponding\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1080 item of each sequence, substituting None for missing values when not all\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1081 sequences have the same length. If the function is None, return a list of\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1082 the items of the sequence (or a list of tuples if more than one sequence).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1083
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1084
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1085 static PyObject *
46607 7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1086 builtin_next(PyObject self, PyObject args)
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1087 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1088 PyObject it, res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1089 PyObject *def = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1090
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1091 if (!PyArg_UnpackTuple(args, "next", 1, 2, &it, &def))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1092 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1093 if (!PyIter_Check(it)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1094 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1095 "%.200s object is not an iterator",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1096 it->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1097 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1098 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1099
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1100 res = (*it->ob_type->tp_iternext)(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1101 if (res != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1102 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1103 } else if (def != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1104 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1105 if (!PyErr_ExceptionMatches(PyExc_StopIteration))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1106 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1107 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1108 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1109 Py_INCREF(def);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1110 return def;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1111 } else if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1112 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1113 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1114 PyErr_SetNone(PyExc_StopIteration);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1115 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1116 }
46607 7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1117 }
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1118
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1119 PyDoc_STRVAR(next_doc,
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1120 "next(iterator[, default])\n\
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1121 \n\
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1122 Return the next item from the iterator. If default is given and the iterator\n\
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1123 is exhausted, it is returned instead of raising StopIteration.");
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1124
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1125
7a6d7474ce6e #2719: backport next() from 3k. Georg Brandl <georg@python.org> parents: 46578 diff changeset	1126 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1127 builtin_setattr(PyObject self, PyObject args)
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	1128 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1129 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1130 PyObject *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1131 PyObject *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1132
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1133 if (!PyArg_UnpackTuple(args, "setattr", 3, 3, &v, &name, &value))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1134 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1135 if (PyObject_SetAttr(v, name, value) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1136 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1137 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1138 return Py_None;
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	1139 }
59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	1140
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1141 PyDoc_STRVAR(setattr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1142 "setattr(object, name, value)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1143 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1144 Set a named attribute on an object; setattr(x, 'y', v) is equivalent to\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1145 ``x.y = v''.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1146
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1147
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1148 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1149 builtin_delattr(PyObject self, PyObject args)
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	1150 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1151 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1152 PyObject *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1153
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1154 if (!PyArg_UnpackTuple(args, "delattr", 2, 2, &v, &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1155 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1156 if (PyObject_SetAttr(v, name, (PyObject *)NULL) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1157 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1158 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1159 return Py_None;
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	1160 }
8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	1161
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1162 PyDoc_STRVAR(delattr_doc,
9514 a126107c433a Fix cosmetic bug in delattr docstring discovered by JvR. Guido van Rossum <guido@python.org> parents: 9188 diff changeset	1163 "delattr(object, name)\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1164 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1165 Delete a named attribute on an object; delattr(x, 'y') is equivalent to\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1166 ``del x.y''.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1167
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1168
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1169 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1170 builtin_hash(PyObject self, PyObject v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1171 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1172 long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1173
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1174 x = PyObject_Hash(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1175 if (x == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1176 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1177 return PyInt_FromLong(x);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1178 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1179
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1180 PyDoc_STRVAR(hash_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1181 "hash(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1182 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1183 Return a hash value for the object. Two objects with the same value have\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1184 the same hash value. The reverse is not necessarily true, but likely.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1185
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1186
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1187 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1188 builtin_hex(PyObject self, PyObject v)
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1189 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1190 PyNumberMethods *nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1191 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1192
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1193 if ((nb = v->ob_type->tp_as_number) == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1194 nb->nb_hex == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1195 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1196 "hex() argument can't be converted to hex");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1197 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1198 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1199 res = (*nb->nb_hex)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1200 if (res && !PyString_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1201 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1202 "__hex__ returned non-string (type %.200s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1203 res->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1204 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1205 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1206 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1207 return res;
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1208 }
9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1209
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1210 PyDoc_STRVAR(hex_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1211 "hex(number) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1212 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1213 Return the hexadecimal representation of an integer or long integer.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1214
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1215
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13446 diff changeset	1216 static PyObject builtin_raw_input(PyObject , PyObject *);
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1049 diff changeset	1217
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1218 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1219 builtin_input(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1220 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1221 PyObject *line;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1222 char *str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1223 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1224 PyObject globals, locals;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1225 PyCompilerFlags cf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1226
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1227 line = builtin_raw_input(self, args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1228 if (line == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1229 return line;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1230 if (!PyArg_Parse(line, "s;embedded '\\0' in input line", &str))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1231 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1232 while (str == ' ' \|\| str == '\t')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1233 str++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1234 globals = PyEval_GetGlobals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1235 locals = PyEval_GetLocals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1236 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1237 if (PyDict_SetItemString(globals, "__builtins__",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1238 PyEval_GetBuiltins()) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1239 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1240 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1241 cf.cf_flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1242 PyEval_MergeCompilerFlags(&cf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1243 res = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1244 Py_DECREF(line);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1245 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1246 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1247
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1248 PyDoc_STRVAR(input_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1249 "input([prompt]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1250 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1251 Equivalent to eval(raw_input(prompt)).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1252
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1253
5092 cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1254 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1255 builtin_intern(PyObject self, PyObject args)
5092 cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1256 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1257 PyObject *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1258 if (!PyArg_ParseTuple(args, "S:intern", &s))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1259 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1260 if (!PyString_CheckExact(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1261 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1262 "can't intern subclass of string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1263 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1264 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1265 Py_INCREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1266 PyString_InternInPlace(&s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1267 return s;
5092 cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1268 }
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1269
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1270 PyDoc_STRVAR(intern_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1271 "intern(string) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1272 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1273 ``Intern'' the given string. This enters the string in the (global)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1274 table of interned strings whose purpose is to speed up dictionary lookups.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1275 Return the string itself or the previously interned string object with the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1276 same value.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1277
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1278
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1279 static PyObject *
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1280 builtin_iter(PyObject self, PyObject args)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1281 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1282 PyObject v, w = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1283
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1284 if (!PyArg_UnpackTuple(args, "iter", 1, 2, &v, &w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1285 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1286 if (w == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1287 return PyObject_GetIter(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1288 if (!PyCallable_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1289 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1290 "iter(v, w): v must be callable");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1291 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1292 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1293 return PyCallIter_New(v, w);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1294 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1295
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1296 PyDoc_STRVAR(iter_doc,
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1297 "iter(collection) -> iterator\n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1298 iter(callable, sentinel) -> iterator\n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1299 \n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1300 Get an iterator from an object. In the first form, the argument must\n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1301 supply its own iterator, or be a sequence.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1302 In the second form, the callable is called until it returns the sentinel.");
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1303
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1304
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1305 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1306 builtin_len(PyObject self, PyObject v)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1307 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1308 Py_ssize_t res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1309
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1310 res = PyObject_Size(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1311 if (res < 0 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1312 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1313 return PyInt_FromSsize_t(res);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1314 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1315
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1316 PyDoc_STRVAR(len_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1317 "len(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1318 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1319 Return the number of items of a sequence or mapping.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1320
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1321
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1322 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1323 builtin_locals(PyObject *self)
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1324 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1325 PyObject *d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1326
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1327 d = PyEval_GetLocals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1328 Py_XINCREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1329 return d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1330 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1331
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1332 PyDoc_STRVAR(locals_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1333 "locals() -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1334 \n\
27076 753306f9b0a0 SF bug #655271: Slightly modify locals() doc Raymond Hettinger <python@rcn.com> parents: 26824 diff changeset	1335 Update and return a dictionary containing the current scope's local variables.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1336
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1337
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1338 static PyObject *
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1339 min_max(PyObject args, PyObject kwds, int op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1340 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1341 PyObject v, it, item, val, maxitem, maxval, *keyfunc=NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1342 const char *name = op == Py_LT ? "min" : "max";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1343
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1344 if (PyTuple_Size(args) > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1345 v = args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1346 else if (!PyArg_UnpackTuple(args, (char *)name, 1, 1, &v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1347 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1348
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1349 if (kwds != NULL && PyDict_Check(kwds) && PyDict_Size(kwds)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1350 keyfunc = PyDict_GetItemString(kwds, "key");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1351 if (PyDict_Size(kwds)!=1 \|\| keyfunc == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1352 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1353 "%s() got an unexpected keyword argument", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1354 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1355 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1356 Py_INCREF(keyfunc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1357 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1358
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1359 it = PyObject_GetIter(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1360 if (it == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1361 Py_XDECREF(keyfunc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1362 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1363 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1364
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1365 maxitem = NULL; /* the result */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1366 maxval = NULL; /* the value associated with the result */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1367 while (( item = PyIter_Next(it) )) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1368 /* get the value from the key function */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1369 if (keyfunc != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1370 val = PyObject_CallFunctionObjArgs(keyfunc, item, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1371 if (val == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1372 goto Fail_it_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1373 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1374 /* no key function; the value is the item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1375 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1376 val = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1377 Py_INCREF(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1378 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1379
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1380 /* maximum value and item are unset; set them */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1381 if (maxval == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1382 maxitem = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1383 maxval = val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1384 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1385 /* maximum value and item are set; update them as necessary */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1386 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1387 int cmp = PyObject_RichCompareBool(val, maxval, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1388 if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1389 goto Fail_it_item_and_val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1390 else if (cmp > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1391 Py_DECREF(maxval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1392 Py_DECREF(maxitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1393 maxval = val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1394 maxitem = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1395 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1396 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1397 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1398 Py_DECREF(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1399 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1400 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1401 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1402 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1403 goto Fail_it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1404 if (maxval == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1405 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1406 "%s() arg is an empty sequence", name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1407 assert(maxitem == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1408 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1409 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1410 Py_DECREF(maxval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1411 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1412 Py_XDECREF(keyfunc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1413 return maxitem;
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1414
cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1415 Fail_it_item_and_val:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1416 Py_DECREF(val);
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1417 Fail_it_item:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1418 Py_DECREF(item);
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1419 Fail_it:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1420 Py_XDECREF(maxval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1421 Py_XDECREF(maxitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1422 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1423 Py_XDECREF(keyfunc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1424 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1425 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1426
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1427 static PyObject *
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1428 builtin_min(PyObject self, PyObject args, PyObject *kwds)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1429 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1430 return min_max(args, kwds, Py_LT);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1431 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1432
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1433 PyDoc_STRVAR(min_doc,
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1434 "min(iterable[, key=func]) -> value\n\
cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1435 min(a, b, c, ...[, key=func]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1436 \n\
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1437 With a single iterable argument, return its smallest item.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1438 With two or more arguments, return the smallest argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1439
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1440
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1441 static PyObject *
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1442 builtin_max(PyObject self, PyObject args, PyObject *kwds)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1443 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1444 return min_max(args, kwds, Py_GT);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1445 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1446
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1447 PyDoc_STRVAR(max_doc,
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1448 "max(iterable[, key=func]) -> value\n\
cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1449 max(a, b, c, ...[, key=func]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1450 \n\
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1451 With a single iterable argument, return its largest item.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1452 With two or more arguments, return the largest argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1453
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1454
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1455 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1456 builtin_oct(PyObject self, PyObject v)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1457 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1458 PyNumberMethods *nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1459 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1460
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1461 if (v == NULL \|\| (nb = v->ob_type->tp_as_number) == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1462 nb->nb_oct == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1463 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1464 "oct() argument can't be converted to oct");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1465 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1466 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1467 res = (*nb->nb_oct)(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1468 if (res && !PyString_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1469 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1470 "__oct__ returned non-string (type %.200s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1471 res->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1472 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1473 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1474 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1475 return res;
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1476 }
9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1477
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1478 PyDoc_STRVAR(oct_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1479 "oct(number) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1480 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1481 Return the octal representation of an integer or long integer.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1482
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1483
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1484 static PyObject *
38077 c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1485 builtin_open(PyObject self, PyObject args, PyObject *kwds)
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1486 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1487 return PyObject_Call((PyObject*)&PyFile_Type, args, kwds);
38077 c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1488 }
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1489
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1490 PyDoc_STRVAR(open_doc,
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1491 "open(name[, mode[, buffering]]) -> file object\n\
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1492 \n\
44222 9a976a6ee936 Note that open() is the preferred way to open files (issue 1510). Skip Montanaro <skip@pobox.com> parents: 44193 diff changeset	1493 Open a file using the file() type, returns a file object. This is the\n\
54383 821f7d42bf74 further hint to where the open docs really are Philip Jenvey <pjenvey@underboss.org> parents: 53956 diff changeset	1494 preferred way to open a file. See file.__doc__ for further information.");
38077 c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1495
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1496
c9202f1c56c2 SF #1479181: split open() and file() from being aliases for each other. Neal Norwitz <nnorwitz@gmail.com> parents: 37673 diff changeset	1497 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1498 builtin_ord(PyObject self, PyObject obj)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1499 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1500 long ord;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1501 Py_ssize_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1502
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1503 if (PyString_Check(obj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1504 size = PyString_GET_SIZE(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1505 if (size == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1506 ord = (long)((unsigned char)*PyString_AS_STRING(obj));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1507 return PyInt_FromLong(ord);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1508 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1509 } else if (PyByteArray_Check(obj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1510 size = PyByteArray_GET_SIZE(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1511 if (size == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1512 ord = (long)((unsigned char)*PyByteArray_AS_STRING(obj));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1513 return PyInt_FromLong(ord);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1514 }
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	1515
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1516 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1517 } else if (PyUnicode_Check(obj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1518 size = PyUnicode_GET_SIZE(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1519 if (size == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1520 ord = (long)*PyUnicode_AS_UNICODE(obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1521 return PyInt_FromLong(ord);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1522 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1523 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1524 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1525 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1526 "ord() expected string of length 1, but " \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1527 "%.200s found", obj->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1528 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1529 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1530
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1531 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1532 "ord() expected a character, "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1533 "but string of length %zd found",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1534 size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1535 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1536 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1537
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1538 PyDoc_STRVAR(ord_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1539 "ord(c) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1540 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1541 Return the integer ordinal of a one-character string.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1542
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1543
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1544 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1545 builtin_pow(PyObject self, PyObject args)
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1546 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1547 PyObject v, w, *z = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1548
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1549 if (!PyArg_UnpackTuple(args, "pow", 2, 3, &v, &w, &z))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1550 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1551 return PyNumber_Power(v, w, z);
223 6693c5d87f3a Added long() and support for longs in int() and float(); Guido van Rossum <guido@python.org> parents: 182 diff changeset	1552 }
6693c5d87f3a Added long() and support for longs in int() and float(); Guido van Rossum <guido@python.org> parents: 182 diff changeset	1553
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1554 PyDoc_STRVAR(pow_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1555 "pow(x, y[, z]) -> number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1556 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1557 With two arguments, equivalent to x**y. With three arguments,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1558 equivalent to (x**y) % z, but may be more efficient (e.g. for longs).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1559
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1560
45891 727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1561 static PyObject *
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1562 builtin_print(PyObject self, PyObject args, PyObject *kwds)
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1563 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1564 static char *kwlist[] = {"sep", "end", "file", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1565 static PyObject *dummy_args = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1566 static PyObject unicode_newline = NULL, unicode_space = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1567 static PyObject str_newline = NULL, str_space = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1568 PyObject newline, space;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1569 PyObject sep = NULL, end = NULL, *file = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1570 int i, err, use_unicode = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1571
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1572 if (dummy_args == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1573 if (!(dummy_args = PyTuple_New(0)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1574 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1575 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1576 if (str_newline == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1577 str_newline = PyString_FromString("\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1578 if (str_newline == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1579 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1580 str_space = PyString_FromString(" ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1581 if (str_space == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1582 Py_CLEAR(str_newline);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1583 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1584 }
77072 d7aff4423172 Issue #8767: Restore building with --disable-unicode. Martin v. Löwis <martin@v.loewis.de> parents: 73402 diff changeset	1585 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1586 unicode_newline = PyUnicode_FromString("\n");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1587 if (unicode_newline == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1588 Py_CLEAR(str_newline);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1589 Py_CLEAR(str_space);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1590 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1591 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1592 unicode_space = PyUnicode_FromString(" ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1593 if (unicode_space == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1594 Py_CLEAR(str_newline);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1595 Py_CLEAR(str_space);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1596 Py_CLEAR(unicode_space);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1597 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1598 }
77072 d7aff4423172 Issue #8767: Restore building with --disable-unicode. Martin v. Löwis <martin@v.loewis.de> parents: 73402 diff changeset	1599 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1600 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1601 if (!PyArg_ParseTupleAndKeywords(dummy_args, kwds, "\|OOO:print",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1602 kwlist, &sep, &end, &file))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1603 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1604 if (file == NULL \|\| file == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1605 file = PySys_GetObject("stdout");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1606 /* sys.stdout may be None when FILE* stdout isn't connected */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1607 if (file == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1608 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1609 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1610 if (sep == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1611 sep = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1612 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1613 else if (sep) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1614 if (PyUnicode_Check(sep)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1615 use_unicode = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1616 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1617 else if (!PyString_Check(sep)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1618 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1619 "sep must be None, str or unicode, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1620 sep->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1621 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1622 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1623 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1624 if (end == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1625 end = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1626 else if (end) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1627 if (PyUnicode_Check(end)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1628 use_unicode = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1629 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1630 else if (!PyString_Check(end)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1631 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1632 "end must be None, str or unicode, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1633 end->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1634 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1635 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1636 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1637
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1638 if (!use_unicode) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1639 for (i = 0; i < PyTuple_Size(args); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1640 if (PyUnicode_Check(PyTuple_GET_ITEM(args, i))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1641 use_unicode = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1642 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1643 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1644 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1645 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1646 if (use_unicode) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1647 newline = unicode_newline;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1648 space = unicode_space;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1649 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1650 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1651 newline = str_newline;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1652 space = str_space;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1653 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1654
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1655 for (i = 0; i < PyTuple_Size(args); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1656 if (i > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1657 if (sep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1658 err = PyFile_WriteObject(space, file,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1659 Py_PRINT_RAW);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1660 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1661 err = PyFile_WriteObject(sep, file,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1662 Py_PRINT_RAW);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1663 if (err)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1664 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1665 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1666 err = PyFile_WriteObject(PyTuple_GetItem(args, i), file,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1667 Py_PRINT_RAW);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1668 if (err)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1669 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1670 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1671
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1672 if (end == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1673 err = PyFile_WriteObject(newline, file, Py_PRINT_RAW);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1674 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1675 err = PyFile_WriteObject(end, file, Py_PRINT_RAW);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1676 if (err)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1677 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1678
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1679 Py_RETURN_NONE;
45891 727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1680 }
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1681
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1682 PyDoc_STRVAR(print_doc,
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1683 "print(value, ..., sep=' ', end='\\n', file=sys.stdout)\n\
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1684 \n\
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1685 Prints the values to a stream, or to sys.stdout by default.\n\
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1686 Optional keyword arguments:\n\
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1687 file: a file-like object (stream); defaults to the current sys.stdout.\n\
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1688 sep: string inserted between values, default a space.\n\
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1689 end: string appended after the last value, default a newline.");
727f743cf630 Backport of the print function, using a __future__ import. Eric Smith <eric@trueblade.com> parents: 45880 diff changeset	1690
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1691
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1692 /* Return number of items in range (lo, hi, step), when arguments are
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1693 * PyInt or PyLong objects. step > 0 required. Return a value < 0 if
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1694 * & only if the true value is too large to fit in a signed long.
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1695 * Arguments MUST return 1 with either PyInt_Check() or
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1696 * PyLong_Check(). Return -1 when there is an error.
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1697 */
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1698 static long
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1699 get_len_of_range_longs(PyObject lo, PyObject hi, PyObject *step)
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1700 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1701 /* -------------------------------------------------------------
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1702 Algorithm is equal to that of get_len_of_range(), but it operates
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1703 on PyObjects (which are assumed to be PyLong or PyInt objects).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1704 ---------------------------------------------------------------*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1705 long n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1706 PyObject *diff = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1707 PyObject *one = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1708 PyObject tmp1 = NULL, tmp2 = NULL, *tmp3 = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1709 /* holds sub-expression evaluations */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1710
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1711 /* if (lo >= hi), return length of 0. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1712 if (PyObject_Compare(lo, hi) >= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1713 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1714
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1715 if ((one = PyLong_FromLong(1L)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1716 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1717
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1718 if ((tmp1 = PyNumber_Subtract(hi, lo)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1719 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1720
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1721 if ((diff = PyNumber_Subtract(tmp1, one)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1722 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1723
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1724 if ((tmp2 = PyNumber_FloorDivide(diff, step)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1725 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1726
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1727 if ((tmp3 = PyNumber_Add(tmp2, one)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1728 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1729
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1730 n = PyLong_AsLong(tmp3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1731 if (PyErr_Occurred()) { /* Check for Overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1732 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1733 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1734 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1735
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1736 Py_DECREF(tmp3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1737 Py_DECREF(tmp2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1738 Py_DECREF(diff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1739 Py_DECREF(tmp1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1740 Py_DECREF(one);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1741 return n;
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1742
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1743 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1744 Py_XDECREF(tmp3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1745 Py_XDECREF(tmp2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1746 Py_XDECREF(diff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1747 Py_XDECREF(tmp1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1748 Py_XDECREF(one);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1749 return -1;
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1750 }
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1751
61360 35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1752 /* Helper function for handle_range_longs. If arg is int or long
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1753 object, returns it with incremented reference count. If arg is
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1754 float, raises type error. As a last resort, creates a new int by
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1755 calling arg type's nb_int method if it is defined. Returns NULL
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1756 and sets exception on error.
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1757
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1758 Returns a new reference to an int object. */
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1759 static PyObject *
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1760 get_range_long_argument(PyObject arg, const char name)
35328f06921c Merged revisions 80758 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57674 diff changeset	1761 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1762 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1763 PyNumberMethods *nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1764 if (PyInt_Check(arg) \|\| PyLong_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1765 Py_INCREF(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1766 return arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1767 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1768 if (PyFloat_Check(arg) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1769 (nb = Py_TYPE(arg)->tp_as_number) == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1770 nb->nb_int == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1771 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1772 "range() integer %s argument expected, got %s.",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1773 name, arg->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1774 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1775 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1776 v = nb->nb_int(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1777 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1778 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1779 if (PyInt_Check(v) \|\| PyLong_Check(v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1780 return v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1781 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1782 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1783 "__int__ should return int object");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1784 return NULL;
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1785 }
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1786
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1787 /* An extension of builtin_range() that handles the case when PyLong
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1788 * arguments are given. */
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1789 static PyObject *
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1790 handle_range_longs(PyObject self, PyObject args)
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1791 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1792 PyObject *ilow = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1793 PyObject *ihigh = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1794 PyObject *istep = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1795
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1796 PyObject *low = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1797 PyObject *high = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1798 PyObject *step = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1799
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1800 PyObject *curnum = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1801 PyObject *v = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1802 long bign;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	1803 Py_ssize_t i, n;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1804 int cmp_result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1805
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1806 PyObject *zero = PyLong_FromLong(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1807
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1808 if (zero == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1809 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1810
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1811 if (!PyArg_UnpackTuple(args, "range", 1, 3, &ilow, &ihigh, &istep)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1812 Py_DECREF(zero);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1813 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1814 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1815
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1816 /* Figure out which way we were called, supply defaults, and be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1817 * sure to incref everything so that the decrefs at the end
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1818 * are correct. NB: ilow, ihigh and istep are borrowed references.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1819 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1820 assert(ilow != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1821 if (ihigh == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1822 /* only 1 arg -- it's the upper limit */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1823 ihigh = ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1824 ilow = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1825 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1826
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1827 /* convert ihigh if necessary */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1828 assert(ihigh != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1829 high = get_range_long_argument(ihigh, "end");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1830 if (high == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1831 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1832
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1833 /* ihigh correct now; do ilow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1834 if (ilow == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1835 Py_INCREF(zero);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1836 low = zero;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1837 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1838 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1839 low = get_range_long_argument(ilow, "start");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1840 if (low == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1841 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1842 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1843
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1844 /* ilow and ihigh correct now; do istep */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1845 if (istep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1846 step = PyLong_FromLong(1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1847 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1848 step = get_range_long_argument(istep, "step");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1849 if (step == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1850 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1851
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1852 if (PyObject_Cmp(step, zero, &cmp_result) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1853 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1854
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1855 if (cmp_result == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1856 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1857 "range() step argument must not be zero");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1858 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1859 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1860
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1861 if (cmp_result > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1862 bign = get_len_of_range_longs(low, high, step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1863 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1864 PyObject *neg_step = PyNumber_Negative(step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1865 if (neg_step == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1866 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1867 bign = get_len_of_range_longs(high, low, neg_step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1868 Py_DECREF(neg_step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1869 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1870
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	1871 n = (Py_ssize_t)bign;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1872 if (bign < 0 \|\| (long)n != bign) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1873 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1874 "range() result has too many items");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1875 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1876 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1877
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1878 v = PyList_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1879 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1880 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1881
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1882 curnum = low;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1883 Py_INCREF(curnum);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1884
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1885 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1886 PyObject *w = PyNumber_Long(curnum);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1887 PyObject *tmp_num;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1888 if (w == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1889 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1890
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1891 PyList_SET_ITEM(v, i, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1892
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1893 tmp_num = PyNumber_Add(curnum, step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1894 if (tmp_num == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1895 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1896
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1897 Py_DECREF(curnum);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1898 curnum = tmp_num;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1899 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1900 Py_DECREF(low);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1901 Py_DECREF(high);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1902 Py_DECREF(step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1903 Py_DECREF(zero);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1904 Py_DECREF(curnum);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1905 return v;
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1906
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1907 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1908 Py_XDECREF(low);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1909 Py_XDECREF(high);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1910 Py_XDECREF(step);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1911 Py_DECREF(zero);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1912 Py_XDECREF(curnum);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1913 Py_XDECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1914 return NULL;
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1915 }
a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1916
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1917 /* Return number of items in range/xrange (lo, hi, step). step > 0
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1918 * required. Return a value < 0 if & only if the true value is too
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1919 * large to fit in a signed long.
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1920 */
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1921 static long
13679 61f65de19e1e Another missed ansification. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	1922 get_len_of_range(long lo, long hi, long step)
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1923 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1924 /* -------------------------------------------------------------
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1925 If lo >= hi, the range is empty.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1926 Else if n values are in the range, the last one is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1927 lo + (n-1)*step, which must be <= hi-1. Rearranging,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1928 n <= (hi - lo - 1)/step + 1, so taking the floor of the RHS gives
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1929 the proper value. Since lo < hi in this case, hi-lo-1 >= 0, so
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1930 the RHS is non-negative and so truncation is the same as the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1931 floor. Letting M be the largest positive long, the worst case
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1932 for the RHS numerator is hi=M, lo=-M-1, and then
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1933 hi-lo-1 = M-(-M-1)-1 = 2*M. Therefore unsigned long has enough
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1934 precision to compute the RHS exactly.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1935 ---------------------------------------------------------------*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1936 long n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1937 if (lo < hi) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1938 unsigned long uhi = (unsigned long)hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1939 unsigned long ulo = (unsigned long)lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1940 unsigned long diff = uhi - ulo - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1941 n = (long)(diff / (unsigned long)step + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1942 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1943 return n;
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1944 }
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1945
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1946 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1947 builtin_range(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1948 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1949 long ilow = 0, ihigh = 0, istep = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1950 long bign;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	1951 Py_ssize_t i, n;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1952
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1953 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1954
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1955 if (PyTuple_Size(args) <= 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1956 if (!PyArg_ParseTuple(args,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1957 "l;range() requires 1-3 int arguments",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1958 &ihigh)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1959 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1960 return handle_range_longs(self, args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1961 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1962 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1963 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1964 if (!PyArg_ParseTuple(args,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1965 "ll\|l;range() requires 1-3 int arguments",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1966 &ilow, &ihigh, &istep)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1967 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1968 return handle_range_longs(self, args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1969 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1970 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1971 if (istep == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1972 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1973 "range() step argument must not be zero");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1974 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1975 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1976 if (istep > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1977 bign = get_len_of_range(ilow, ihigh, istep);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1978 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1979 bign = get_len_of_range(ihigh, ilow, -istep);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	1980 n = (Py_ssize_t)bign;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1981 if (bign < 0 \|\| (long)n != bign) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1982 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1983 "range() result has too many items");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1984 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1985 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1986 v = PyList_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1987 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1988 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1989 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1990 PyObject *w = PyInt_FromLong(ilow);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1991 if (w == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1992 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1993 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1994 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1995 PyList_SET_ITEM(v, i, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1996 ilow += istep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1997 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	1998 return v;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1999 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2000
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2001 PyDoc_STRVAR(range_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2002 "range([start,] stop[, step]) -> list of integers\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2003 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2004 Return a list containing an arithmetic progression of integers.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2005 range(i, j) returns [i, i+1, i+2, ..., j-1]; start (!) defaults to 0.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2006 When step is given, it specifies the increment (or decrement).\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2007 For example, range(4) returns [0, 1, 2, 3]. The end point is omitted!\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2008 These are exactly the valid indices for a list of 4 elements.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2009
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2010
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2011 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2012 builtin_raw_input(PyObject self, PyObject args)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2013 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2014 PyObject *v = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2015 PyObject *fin = PySys_GetObject("stdin");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2016 PyObject *fout = PySys_GetObject("stdout");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2017
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2018 if (!PyArg_UnpackTuple(args, "[raw_]input", 0, 1, &v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2019 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2020
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2021 if (fin == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2022 PyErr_SetString(PyExc_RuntimeError, "[raw_]input: lost sys.stdin");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2023 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2024 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2025 if (fout == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2026 PyErr_SetString(PyExc_RuntimeError, "[raw_]input: lost sys.stdout");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2027 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2028 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2029 if (PyFile_SoftSpace(fout, 0)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2030 if (PyFile_WriteString(" ", fout) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2031 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2032 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2033 if (PyFile_AsFile(fin) && PyFile_AsFile(fout)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2034 && isatty(fileno(PyFile_AsFile(fin)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2035 && isatty(fileno(PyFile_AsFile(fout)))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2036 PyObject *po;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2037 char *prompt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2038 char *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2039 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2040 if (v != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2041 po = PyObject_Str(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2042 if (po == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2043 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2044 prompt = PyString_AsString(po);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2045 if (prompt == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2046 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2047 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2048 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2049 po = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2050 prompt = "";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2051 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2052 s = PyOS_Readline(PyFile_AsFile(fin), PyFile_AsFile(fout),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2053 prompt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2054 Py_XDECREF(po);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2055 if (s == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2056 if (!PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2057 PyErr_SetNone(PyExc_KeyboardInterrupt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2058 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2059 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2060 if (*s == '\0') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2061 PyErr_SetNone(PyExc_EOFError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2062 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2063 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2064 else { /* strip trailing '\n' */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2065 size_t len = strlen(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2066 if (len > PY_SSIZE_T_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2067 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2068 "[raw_]input: input too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2069 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2070 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2071 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2072 result = PyString_FromStringAndSize(s, len-1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2073 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2074 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2075 PyMem_FREE(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2076 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2077 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2078 if (v != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2079 if (PyFile_WriteObject(v, fout, Py_PRINT_RAW) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2080 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2081 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2082 return PyFile_GetLine(fin, -1);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2083 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2084
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2085 PyDoc_STRVAR(raw_input_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2086 "raw_input([prompt]) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2087 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2088 Read a string from standard input. The trailing newline is stripped.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2089 If the user hits EOF (Unix: Ctl-D, Windows: Ctl-Z+Return), raise EOFError.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2090 On Unix, GNU readline is used if enabled. The prompt string, if given,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2091 is printed without a trailing newline before reading.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2092
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2093
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2094 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2095 builtin_reduce(PyObject self, PyObject args)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2096 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2097 static PyObject *functools_reduce = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2098
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2099 if (PyErr_WarnPy3k("reduce() not supported in 3.x; "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2100 "use functools.reduce()", 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2101 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2102
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2103 if (functools_reduce == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2104 PyObject *functools = PyImport_ImportModule("functools");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2105 if (functools == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2106 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2107 functools_reduce = PyObject_GetAttrString(functools, "reduce");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2108 Py_DECREF(functools);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2109 if (functools_reduce == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2110 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2111 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2112 return PyObject_Call(functools_reduce, args, NULL);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2113 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2114
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2115 PyDoc_STRVAR(reduce_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2116 "reduce(function, sequence[, initial]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2117 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2118 Apply a function of two arguments cumulatively to the items of a sequence,\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2119 from left to right, so as to reduce the sequence to a single value.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2120 For example, reduce(lambda x, y: x+y, [1, 2, 3, 4, 5]) calculates\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2121 ((((1+2)+3)+4)+5). If initial is present, it is placed before the items\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2122 of the sequence in the calculation, and serves as a default when the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2123 sequence is empty.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2124
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2125
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2126 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	2127 builtin_reload(PyObject self, PyObject v)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	2128 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2129 if (PyErr_WarnPy3k("In 3.x, reload() is renamed to imp.reload()",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2130 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2131 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2132
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2133 return PyImport_ReloadModule(v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2134 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2135
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2136 PyDoc_STRVAR(reload_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2137 "reload(module) -> module\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2138 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2139 Reload the module. The module must have been successfully imported before.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2140
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2141
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2142 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	2143 builtin_repr(PyObject self, PyObject v)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	2144 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2145 return PyObject_Repr(v);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	2146 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	2147
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2148 PyDoc_STRVAR(repr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2149 "repr(object) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2150 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2151 Return the canonical string representation of the object.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2152 For most object types, eval(repr(object)) == object.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2153
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2154
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2155 static PyObject *
37344 c6cf11acb41f Patch #1460496: round() now accepts keyword arguments. Georg Brandl <georg@python.org> parents: 36866 diff changeset	2156 builtin_round(PyObject self, PyObject args, PyObject *kwds)
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	2157 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2158 double x;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2159 PyObject *o_ndigits = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2160 Py_ssize_t ndigits;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2161 static char *kwlist[] = {"number", "ndigits", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2162
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2163 if (!PyArg_ParseTupleAndKeywords(args, kwds, "d\|O:round",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2164 kwlist, &x, &o_ndigits))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2165 return NULL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2166
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2167 if (o_ndigits == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2168 /* second argument defaults to 0 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2169 ndigits = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2170 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2171 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2172 /* interpret 2nd argument as a Py_ssize_t; clip on overflow */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2173 ndigits = PyNumber_AsSsize_t(o_ndigits, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2174 if (ndigits == -1 && PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2175 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2176 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2177
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2178 /* nans, infinities and zeros round to themselves */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2179 if (!Py_IS_FINITE(x) \|\| x == 0.0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2180 return PyFloat_FromDouble(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2181
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2182 /* Deal with extreme values for ndigits. For ndigits > NDIGITS_MAX, x
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2183 always rounds to itself. For ndigits < NDIGITS_MIN, x always
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2184 rounds to +-0.0. Here 0.30103 is an upper bound for log10(2). */
57324 92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 57306 diff changeset	2185 #define NDIGITS_MAX ((int)((DBL_MANT_DIG-DBL_MIN_EXP) * 0.30103))
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 57306 diff changeset	2186 #define NDIGITS_MIN (-(int)((DBL_MAX_EXP + 1) * 0.30103))
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2187 if (ndigits > NDIGITS_MAX)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2188 /* return x */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2189 return PyFloat_FromDouble(x);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2190 else if (ndigits < NDIGITS_MIN)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2191 /* return 0.0, but with sign of x */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2192 return PyFloat_FromDouble(0.0*x);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2193 else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2194 /* finite x, and ndigits is not unreasonably large */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2195 /* _Py_double_round is defined in floatobject.c */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2196 return _Py_double_round(x, (int)ndigits);
57324 92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 57306 diff changeset	2197 #undef NDIGITS_MAX
92e06cdbeab9 Issue #7117, continued: Change round implementation to use the correctly-rounded Mark Dickinson <dickinsm@gmail.com> parents: 57306 diff changeset	2198 #undef NDIGITS_MIN
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	2199 }
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	2200
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2201 PyDoc_STRVAR(round_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2202 "round(number[, ndigits]) -> floating point number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2203 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2204 Round a number to a given precision in decimal digits (default 0 digits).\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2205 This always returns a floating point number. Precision may be negative.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2206
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2207 static PyObject *
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2208 builtin_sorted(PyObject self, PyObject args, PyObject *kwds)
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2209 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2210 PyObject newlist, v, seq, compare=NULL, keyfunc=NULL, newargs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2211 PyObject *callable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2212 static char *kwlist[] = {"iterable", "cmp", "key", "reverse", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2213 int reverse;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2214
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2215 /* args 1-4 should match listsort in Objects/listobject.c */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2216 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|OOi:sorted",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2217 kwlist, &seq, &compare, &keyfunc, &reverse))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2218 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2219
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2220 newlist = PySequence_List(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2221 if (newlist == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2222 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2223
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2224 callable = PyObject_GetAttrString(newlist, "sort");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2225 if (callable == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2226 Py_DECREF(newlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2227 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2228 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2229
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2230 newargs = PyTuple_GetSlice(args, 1, 4);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2231 if (newargs == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2232 Py_DECREF(newlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2233 Py_DECREF(callable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2234 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2235 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2236
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2237 v = PyObject_Call(callable, newargs, kwds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2238 Py_DECREF(newargs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2239 Py_DECREF(callable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2240 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2241 Py_DECREF(newlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2242 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2243 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2244 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2245 return newlist;
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2246 }
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2247
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2248 PyDoc_STRVAR(sorted_doc,
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	2249 "sorted(iterable, cmp=None, key=None, reverse=False) --> new sorted list");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2250
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2251 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2252 builtin_vars(PyObject self, PyObject args)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	2253 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2254 PyObject *v = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2255 PyObject *d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2256
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2257 if (!PyArg_UnpackTuple(args, "vars", 0, 1, &v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2258 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2259 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2260 d = PyEval_GetLocals();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2261 if (d == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2262 if (!PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2263 PyErr_SetString(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2264 "vars(): no locals!?");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2265 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2266 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2267 Py_INCREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2268 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2269 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2270 d = PyObject_GetAttrString(v, "__dict__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2271 if (d == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2272 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2273 "vars() argument must have __dict__ attribute");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2274 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2275 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2276 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2277 return d;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	2278 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	2279
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2280 PyDoc_STRVAR(vars_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2281 "vars([object]) -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2282 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2283 Without arguments, equivalent to locals().\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2284 With an argument, equivalent to object.__dict__.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2285
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2286
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2287 static PyObject*
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2288 builtin_sum(PyObject self, PyObject args)
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2289 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2290 PyObject *seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2291 PyObject *result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2292 PyObject temp, item, *iter;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2293
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2294 if (!PyArg_UnpackTuple(args, "sum", 1, 2, &seq, &result))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2295 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2296
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2297 iter = PyObject_GetIter(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2298 if (iter == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2299 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2300
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2301 if (result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2302 result = PyInt_FromLong(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2303 if (result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2304 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2305 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2306 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2307 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2308 /* reject string values for 'start' parameter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2309 if (PyObject_TypeCheck(result, &PyBaseString_Type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2310 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2311 "sum() can't sum strings [use ''.join(seq) instead]");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2312 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2313 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2314 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2315 Py_INCREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2316 }
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2317
43657 08ee256a9bd1 Optimize sum() for integer and float inputs. Raymond Hettinger <python@rcn.com> parents: 41834 diff changeset	2318 #ifndef SLOW_SUM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2319 /* Fast addition by keeping temporary sums in C instead of new Python objects.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2320 Assumes all inputs are the same type. If the assumption fails, default
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2321 to the more general routine.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2322 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2323 if (PyInt_CheckExact(result)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2324 long i_result = PyInt_AS_LONG(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2325 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2326 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2327 while(result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2328 item = PyIter_Next(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2329 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2330 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2331 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2332 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2333 return PyInt_FromLong(i_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2334 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2335 if (PyInt_CheckExact(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2336 long b = PyInt_AS_LONG(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2337 long x = i_result + b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2338 if ((x^i_result) >= 0 \|\| (x^b) >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2339 i_result = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2340 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2341 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2342 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2343 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2344 /* Either overflowed or is not an int. Restore real objects and process normally */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2345 result = PyInt_FromLong(i_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2346 temp = PyNumber_Add(result, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2347 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2348 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2349 result = temp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2350 if (result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2351 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2352 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2353 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2354 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2355 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2356
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2357 if (PyFloat_CheckExact(result)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2358 double f_result = PyFloat_AS_DOUBLE(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2359 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2360 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2361 while(result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2362 item = PyIter_Next(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2363 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2364 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2365 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2366 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2367 return PyFloat_FromDouble(f_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2368 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2369 if (PyFloat_CheckExact(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2370 PyFPE_START_PROTECT("add", Py_DECREF(item); Py_DECREF(iter); return 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2371 f_result += PyFloat_AS_DOUBLE(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2372 PyFPE_END_PROTECT(f_result)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2373 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2374 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2375 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2376 if (PyInt_CheckExact(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2377 PyFPE_START_PROTECT("add", Py_DECREF(item); Py_DECREF(iter); return 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2378 f_result += (double)PyInt_AS_LONG(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2379 PyFPE_END_PROTECT(f_result)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2380 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2381 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2382 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2383 result = PyFloat_FromDouble(f_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2384 temp = PyNumber_Add(result, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2385 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2386 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2387 result = temp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2388 if (result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2389 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2390 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2391 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2392 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2393 }
43657 08ee256a9bd1 Optimize sum() for integer and float inputs. Raymond Hettinger <python@rcn.com> parents: 41834 diff changeset	2394 #endif
08ee256a9bd1 Optimize sum() for integer and float inputs. Raymond Hettinger <python@rcn.com> parents: 41834 diff changeset	2395
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2396 for(;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2397 item = PyIter_Next(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2398 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2399 /* error, or end-of-sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2400 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2401 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2402 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2403 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2404 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2405 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2406 /* It's tempting to use PyNumber_InPlaceAdd instead of
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2407 PyNumber_Add here, to avoid quadratic running time
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2408 when doing 'sum(list_of_lists, [])'. However, this
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2409 would produce a change in behaviour: a snippet like
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2410
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2411 empty = []
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2412 sum([[x] for x in range(10)], empty)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2413
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2414 would change the value of empty. */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2415 temp = PyNumber_Add(result, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2416 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2417 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2418 result = temp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2419 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2420 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2421 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2422 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2423 return result;
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2424 }
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2425
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2426 PyDoc_STRVAR(sum_doc,
40113 635438b29673 Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). Georg Brandl <georg@python.org> parents: 39746 diff changeset	2427 "sum(sequence[, start]) -> value\n\
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2428 \n\
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2429 Returns the sum of a sequence of numbers (NOT strings) plus the value\n\
40113 635438b29673 Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). Georg Brandl <georg@python.org> parents: 39746 diff changeset	2430 of parameter 'start' (which defaults to 0). When the sequence is\n\
635438b29673 Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). Georg Brandl <georg@python.org> parents: 39746 diff changeset	2431 empty, returns start.");
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2432
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2433
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2434 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2435 builtin_isinstance(PyObject self, PyObject args)
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2436 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2437 PyObject *inst;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2438 PyObject *cls;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2439 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2440
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2441 if (!PyArg_UnpackTuple(args, "isinstance", 2, 2, &inst, &cls))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2442 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2443
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2444 retval = PyObject_IsInstance(inst, cls);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2445 if (retval < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2446 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2447 return PyBool_FromLong(retval);
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2448 }
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2449
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2450 PyDoc_STRVAR(isinstance_doc,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22205 diff changeset	2451 "isinstance(object, class-or-type-or-tuple) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2452 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2453 Return whether an object is an instance of a class or of a subclass thereof.\n\
20307 aa681345bfab Implement isinstance(x, (A, B, ...)). Note that we only allow tuples, Guido van Rossum <guido@python.org> parents: 19903 diff changeset	2454 With a type as second argument, return whether that is the object's type.\n\
aa681345bfab Implement isinstance(x, (A, B, ...)). Note that we only allow tuples, Guido van Rossum <guido@python.org> parents: 19903 diff changeset	2455 The form using a tuple, isinstance(x, (A, B, ...)), is a shortcut for\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2456 isinstance(x, A) or isinstance(x, B) or ... (etc.).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2457
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2458
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2459 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2460 builtin_issubclass(PyObject self, PyObject args)
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2461 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2462 PyObject *derived;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2463 PyObject *cls;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2464 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2465
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2466 if (!PyArg_UnpackTuple(args, "issubclass", 2, 2, &derived, &cls))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2467 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2468
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2469 retval = PyObject_IsSubclass(derived, cls);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2470 if (retval < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2471 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2472 return PyBool_FromLong(retval);
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2473 }
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2474
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2475 PyDoc_STRVAR(issubclass_doc,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22205 diff changeset	2476 "issubclass(C, B) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2477 \n\
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25924 diff changeset	2478 Return whether class C is a subclass (i.e., a derived class) of class B.\n\
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25924 diff changeset	2479 When using a tuple as the second argument issubclass(X, (A, B, ...)),\n\
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25924 diff changeset	2480 is a shortcut for issubclass(X, A) or issubclass(X, B) or ... (etc.).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2481
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2482
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2483 static PyObject*
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2484 builtin_zip(PyObject self, PyObject args)
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2485 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2486 PyObject *ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2487 const Py_ssize_t itemsize = PySequence_Length(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2488 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2489 PyObject itlist; / tuple of iterators */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2490 Py_ssize_t len; /* guess at result length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2491
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2492 if (itemsize == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2493 return PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2494
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2495 /* args must be a tuple */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2496 assert(PyTuple_Check(args));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2497
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2498 /* Guess at result length: the shortest of the input lengths.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2499 If some argument refuses to say, we refuse to guess too, lest
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2500 an argument like xrange(sys.maxint) lead us astray.*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2501 len = -1; /* unknown */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2502 for (i = 0; i < itemsize; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2503 PyObject *item = PyTuple_GET_ITEM(args, i);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2504 Py_ssize_t thislen = _PyObject_LengthHint(item, -2);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2505 if (thislen < 0) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2506 if (thislen == -1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2507 return NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2508 len = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2509 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2510 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2511 else if (len < 0 \|\| thislen < len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2512 len = thislen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2513 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2514
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2515 /* allocate result list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2516 if (len < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2517 len = 10; /* arbitrary */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2518 if ((ret = PyList_New(len)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2519 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2520
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2521 /* obtain iterators */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2522 itlist = PyTuple_New(itemsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2523 if (itlist == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2524 goto Fail_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2525 for (i = 0; i < itemsize; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2526 PyObject *item = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2527 PyObject *it = PyObject_GetIter(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2528 if (it == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2529 if (PyErr_ExceptionMatches(PyExc_TypeError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2530 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2531 "zip argument #%zd must support iteration",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2532 i+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2533 goto Fail_ret_itlist;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2534 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2535 PyTuple_SET_ITEM(itlist, i, it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2536 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2537
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2538 /* build result into ret list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2539 for (i = 0; ; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2540 int j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2541 PyObject *next = PyTuple_New(itemsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2542 if (!next)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2543 goto Fail_ret_itlist;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2544
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2545 for (j = 0; j < itemsize; j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2546 PyObject *it = PyTuple_GET_ITEM(itlist, j);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2547 PyObject *item = PyIter_Next(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2548 if (!item) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2549 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2550 Py_DECREF(ret);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2551 ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2552 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2553 Py_DECREF(next);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2554 Py_DECREF(itlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2555 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2556 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2557 PyTuple_SET_ITEM(next, j, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2558 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2559
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2560 if (i < len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2561 PyList_SET_ITEM(ret, i, next);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2562 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2563 int status = PyList_Append(ret, next);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2564 Py_DECREF(next);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2565 ++len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2566 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2567 goto Fail_ret_itlist;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2568 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2569 }
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	2570
23305 ef6e31f0cee1 builtin_zip(): Take a good guess at how big the result list will be, Tim Peters <tim.peters@gmail.com> parents: 23295 diff changeset	2571 Done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2572 if (ret != NULL && i < len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2573 /* The list is too big. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2574 if (PyList_SetSlice(ret, i, len, NULL) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2575 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2576 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2577 return ret;
23305 ef6e31f0cee1 builtin_zip(): Take a good guess at how big the result list will be, Tim Peters <tim.peters@gmail.com> parents: 23295 diff changeset	2578
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	2579 Fail_ret_itlist:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2580 Py_DECREF(itlist);
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	2581 Fail_ret:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2582 Py_DECREF(ret);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2583 return NULL;
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2584 }
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2585
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2586
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2587 PyDoc_STRVAR(zip_doc,
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2588 "zip(seq1 [, seq2 [...]]) -> [(seq1[0], seq2[0] ...), (...)]\n\
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2589 \n\
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2590 Return a list of tuples, where each tuple contains the i-th element\n\
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2591 from each of the argument sequences. The returned list is truncated\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2592 in length to the length of the shortest argument sequence.");
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2593
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2594
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2595 static PyMethodDef builtin_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2596 {"__import__", (PyCFunction)builtin___import__, METH_VARARGS \| METH_KEYWORDS, import_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2597 {"abs", builtin_abs, METH_O, abs_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2598 {"all", builtin_all, METH_O, all_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2599 {"any", builtin_any, METH_O, any_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2600 {"apply", builtin_apply, METH_VARARGS, apply_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2601 {"bin", builtin_bin, METH_O, bin_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2602 {"callable", builtin_callable, METH_O, callable_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2603 {"chr", builtin_chr, METH_VARARGS, chr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2604 {"cmp", builtin_cmp, METH_VARARGS, cmp_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2605 {"coerce", builtin_coerce, METH_VARARGS, coerce_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2606 {"compile", (PyCFunction)builtin_compile, METH_VARARGS \| METH_KEYWORDS, compile_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2607 {"delattr", builtin_delattr, METH_VARARGS, delattr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2608 {"dir", builtin_dir, METH_VARARGS, dir_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2609 {"divmod", builtin_divmod, METH_VARARGS, divmod_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2610 {"eval", builtin_eval, METH_VARARGS, eval_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2611 {"execfile", builtin_execfile, METH_VARARGS, execfile_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2612 {"filter", builtin_filter, METH_VARARGS, filter_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2613 {"format", builtin_format, METH_VARARGS, format_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2614 {"getattr", builtin_getattr, METH_VARARGS, getattr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2615 {"globals", (PyCFunction)builtin_globals, METH_NOARGS, globals_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2616 {"hasattr", builtin_hasattr, METH_VARARGS, hasattr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2617 {"hash", builtin_hash, METH_O, hash_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2618 {"hex", builtin_hex, METH_O, hex_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2619 {"id", builtin_id, METH_O, id_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2620 {"input", builtin_input, METH_VARARGS, input_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2621 {"intern", builtin_intern, METH_VARARGS, intern_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2622 {"isinstance", builtin_isinstance, METH_VARARGS, isinstance_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2623 {"issubclass", builtin_issubclass, METH_VARARGS, issubclass_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2624 {"iter", builtin_iter, METH_VARARGS, iter_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2625 {"len", builtin_len, METH_O, len_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2626 {"locals", (PyCFunction)builtin_locals, METH_NOARGS, locals_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2627 {"map", builtin_map, METH_VARARGS, map_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2628 {"max", (PyCFunction)builtin_max, METH_VARARGS \| METH_KEYWORDS, max_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2629 {"min", (PyCFunction)builtin_min, METH_VARARGS \| METH_KEYWORDS, min_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2630 {"next", builtin_next, METH_VARARGS, next_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2631 {"oct", builtin_oct, METH_O, oct_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2632 {"open", (PyCFunction)builtin_open, METH_VARARGS \| METH_KEYWORDS, open_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2633 {"ord", builtin_ord, METH_O, ord_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2634 {"pow", builtin_pow, METH_VARARGS, pow_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2635 {"print", (PyCFunction)builtin_print, METH_VARARGS \| METH_KEYWORDS, print_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2636 {"range", builtin_range, METH_VARARGS, range_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2637 {"raw_input", builtin_raw_input, METH_VARARGS, raw_input_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2638 {"reduce", builtin_reduce, METH_VARARGS, reduce_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2639 {"reload", builtin_reload, METH_O, reload_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2640 {"repr", builtin_repr, METH_O, repr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2641 {"round", (PyCFunction)builtin_round, METH_VARARGS \| METH_KEYWORDS, round_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2642 {"setattr", builtin_setattr, METH_VARARGS, setattr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2643 {"sorted", (PyCFunction)builtin_sorted, METH_VARARGS \| METH_KEYWORDS, sorted_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2644 {"sum", builtin_sum, METH_VARARGS, sum_doc},
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2645 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2646 {"unichr", builtin_unichr, METH_VARARGS, unichr_doc},
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2647 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2648 {"vars", builtin_vars, METH_VARARGS, vars_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2649 {"zip", builtin_zip, METH_VARARGS, zip_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2650 {NULL, NULL},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2651 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2652
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2653 PyDoc_STRVAR(builtin_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2654 "Built-in functions, exceptions, and other objects.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2655 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2656 Noteworthy: None is the `nil' object; Ellipsis represents `...' in slices.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2657
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2658 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2659 _PyBuiltin_Init(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2660 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2661 PyObject mod, dict, *debug;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2662 mod = Py_InitModule4("__builtin__", builtin_methods,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2663 builtin_doc, (PyObject *)NULL,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2664 PYTHON_API_VERSION);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2665 if (mod == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2666 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2667 dict = PyModule_GetDict(mod);
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	2668
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2669 #ifdef Py_TRACE_REFS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2670 /* __builtin__ exposes a number of statically allocated objects
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2671 * that, before this code was added in 2.3, never showed up in
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2672 * the list of "all objects" maintained by Py_TRACE_REFS. As a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2673 * result, programs leaking references to None and False (etc)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2674 * couldn't be diagnosed by examining sys.getobjects(0).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2675 */
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2676 #define ADD_TO_ALL(OBJECT) _Py_AddToAllObjects((PyObject *)(OBJECT), 0)
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2677 #else
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2678 #define ADD_TO_ALL(OBJECT) (void)0
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2679 #endif
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2680
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	2681 #define SETBUILTIN(NAME, OBJECT) \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2682 if (PyDict_SetItemString(dict, NAME, (PyObject *)OBJECT) < 0) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2683 return NULL; \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2684 ADD_TO_ALL(OBJECT)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2685
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2686 SETBUILTIN("None", Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2687 SETBUILTIN("Ellipsis", Py_Ellipsis);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2688 SETBUILTIN("NotImplemented", Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2689 SETBUILTIN("False", Py_False);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2690 SETBUILTIN("True", Py_True);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2691 SETBUILTIN("basestring", &PyBaseString_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2692 SETBUILTIN("bool", &PyBool_Type);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61217 diff changeset	2693 SETBUILTIN("memoryview", &PyMemoryView_Type);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2694 SETBUILTIN("bytearray", &PyByteArray_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2695 SETBUILTIN("bytes", &PyString_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2696 SETBUILTIN("buffer", &PyBuffer_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2697 SETBUILTIN("classmethod", &PyClassMethod_Type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18890 diff changeset	2698 #ifndef WITHOUT_COMPLEX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2699 SETBUILTIN("complex", &PyComplex_Type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18890 diff changeset	2700 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2701 SETBUILTIN("dict", &PyDict_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2702 SETBUILTIN("enumerate", &PyEnum_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2703 SETBUILTIN("file", &PyFile_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2704 SETBUILTIN("float", &PyFloat_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2705 SETBUILTIN("frozenset", &PyFrozenSet_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2706 SETBUILTIN("property", &PyProperty_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2707 SETBUILTIN("int", &PyInt_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2708 SETBUILTIN("list", &PyList_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2709 SETBUILTIN("long", &PyLong_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2710 SETBUILTIN("object", &PyBaseObject_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2711 SETBUILTIN("reversed", &PyReversed_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2712 SETBUILTIN("set", &PySet_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2713 SETBUILTIN("slice", &PySlice_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2714 SETBUILTIN("staticmethod", &PyStaticMethod_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2715 SETBUILTIN("str", &PyString_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2716 SETBUILTIN("super", &PySuper_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2717 SETBUILTIN("tuple", &PyTuple_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2718 SETBUILTIN("type", &PyType_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2719 SETBUILTIN("xrange", &PyRange_Type);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2720 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2721 SETBUILTIN("unicode", &PyUnicode_Type);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2722 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2723 debug = PyBool_FromLong(Py_OptimizeFlag == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2724 if (PyDict_SetItemString(dict, "__debug__", debug) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2725 Py_XDECREF(debug);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2726 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2727 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2728 Py_XDECREF(debug);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2729
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2730 return mod;
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2731 #undef ADD_TO_ALL
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	2732 #undef SETBUILTIN
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2733 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2734
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1387 diff changeset	2735 /* Helper for filter(): filter a tuple through a function */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2736
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2737 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2738 filtertuple(PyObject func, PyObject tuple)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2739 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2740 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2741 Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2742 Py_ssize_t len = PyTuple_Size(tuple);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2743
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2744 if (len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2745 if (PyTuple_CheckExact(tuple))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2746 Py_INCREF(tuple);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2747 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2748 tuple = PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2749 return tuple;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2750 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2751
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2752 if ((result = PyTuple_New(len)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2753 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2754
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2755 for (i = j = 0; i < len; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2756 PyObject item, good;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2757 int ok;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2758
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2759 if (tuple->ob_type->tp_as_sequence &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2760 tuple->ob_type->tp_as_sequence->sq_item) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2761 item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2762 if (item == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2763 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2764 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2765 PyErr_SetString(PyExc_TypeError, "filter(): unsubscriptable tuple");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2766 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2767 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2768 if (func == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2769 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2770 good = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2771 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2772 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2773 PyObject *arg = PyTuple_Pack(1, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2774 if (arg == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2775 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2776 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2777 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2778 good = PyEval_CallObject(func, arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2779 Py_DECREF(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2780 if (good == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2781 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2782 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2783 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2784 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2785 ok = PyObject_IsTrue(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2786 Py_DECREF(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2787 if (ok) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2788 if (PyTuple_SetItem(result, j++, item) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2789 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2790 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2791 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2792 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2793 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2794
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2795 if (_PyTuple_Resize(&result, j) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2796 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2797
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2798 return result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2799
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2800 Fail_1:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2801 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2802 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2803 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2804
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2805
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1387 diff changeset	2806 /* Helper for filter(): filter a string through a function */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2807
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2808 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2809 filterstring(PyObject func, PyObject strobj)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2810 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2811 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2812 Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2813 Py_ssize_t len = PyString_Size(strobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2814 Py_ssize_t outlen = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2815
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2816 if (func == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2817 /* If it's a real string we can return the original,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2818 * as no character is ever false and __getitem__
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2819 * does return this character. If it's a subclass
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2820 * we must go through the __getitem__ loop */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2821 if (PyString_CheckExact(strobj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2822 Py_INCREF(strobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2823 return strobj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2824 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2825 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2826 if ((result = PyString_FromStringAndSize(NULL, len)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2827 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2828
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2829 for (i = j = 0; i < len; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2830 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2831 int ok;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2832
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2833 item = (*strobj->ob_type->tp_as_sequence->sq_item)(strobj, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2834 if (item == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2835 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2836 if (func==Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2837 ok = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2838 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2839 PyObject arg, good;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2840 arg = PyTuple_Pack(1, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2841 if (arg == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2842 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2843 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2844 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2845 good = PyEval_CallObject(func, arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2846 Py_DECREF(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2847 if (good == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2848 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2849 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2850 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2851 ok = PyObject_IsTrue(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2852 Py_DECREF(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2853 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2854 if (ok) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2855 Py_ssize_t reslen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2856 if (!PyString_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2857 PyErr_SetString(PyExc_TypeError, "can't filter str to str:"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2858 " __getitem__ returned different type");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2859 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2860 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2861 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2862 reslen = PyString_GET_SIZE(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2863 if (reslen == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2864 PyString_AS_STRING(result)[j++] =
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2865 PyString_AS_STRING(item)[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2866 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2867 /* do we need more space? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2868 Py_ssize_t need = j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2869
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2870 /* calculate space requirements while checking for overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2871 if (need > PY_SSIZE_T_MAX - reslen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2872 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2873 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2874 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2875
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2876 need += reslen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2877
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2878 if (need > PY_SSIZE_T_MAX - len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2879 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2880 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2881 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2882
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2883 need += len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2884
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2885 if (need <= i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2886 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2887 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2888 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2889
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2890 need = need - i - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2891
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2892 assert(need >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2893 assert(outlen >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2894
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2895 if (need > outlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2896 /* overallocate, to avoid reallocations */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2897 if (outlen > PY_SSIZE_T_MAX / 2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2898 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2899 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2900 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2901
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2902 if (need<2*outlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2903 need = 2*outlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2904 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2905 if (_PyString_Resize(&result, need)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2906 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2907 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2908 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2909 outlen = need;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2910 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2911 memcpy(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2912 PyString_AS_STRING(result) + j,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2913 PyString_AS_STRING(item),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2914 reslen
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2915 );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2916 j += reslen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2917 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2918 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2919 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2920 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2921
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2922 if (j < outlen)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2923 _PyString_Resize(&result, j);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2924
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2925 return result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2926
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2927 Fail_1:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2928 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2929 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2930 }
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2931
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2932 #ifdef Py_USING_UNICODE
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2933 /* Helper for filter(): filter a Unicode object through a function */
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2934
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2935 static PyObject *
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2936 filterunicode(PyObject func, PyObject strobj)
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2937 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2938 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2939 register Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2940 Py_ssize_t len = PyUnicode_GetSize(strobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2941 Py_ssize_t outlen = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2942
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2943 if (func == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2944 /* If it's a real string we can return the original,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2945 * as no character is ever false and __getitem__
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2946 * does return this character. If it's a subclass
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2947 * we must go through the __getitem__ loop */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2948 if (PyUnicode_CheckExact(strobj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2949 Py_INCREF(strobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2950 return strobj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2951 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2952 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2953 if ((result = PyUnicode_FromUnicode(NULL, len)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2954 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2955
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2956 for (i = j = 0; i < len; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2957 PyObject item, arg, *good;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2958 int ok;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2959
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2960 item = (*strobj->ob_type->tp_as_sequence->sq_item)(strobj, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2961 if (item == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2962 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2963 if (func == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2964 ok = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2965 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2966 arg = PyTuple_Pack(1, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2967 if (arg == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2968 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2969 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2970 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2971 good = PyEval_CallObject(func, arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2972 Py_DECREF(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2973 if (good == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2974 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2975 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2976 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2977 ok = PyObject_IsTrue(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2978 Py_DECREF(good);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2979 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2980 if (ok) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2981 Py_ssize_t reslen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2982 if (!PyUnicode_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2983 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2984 "can't filter unicode to unicode:"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2985 " __getitem__ returned different type");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2986 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2987 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2988 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2989 reslen = PyUnicode_GET_SIZE(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2990 if (reslen == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2991 PyUnicode_AS_UNICODE(result)[j++] =
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2992 PyUnicode_AS_UNICODE(item)[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2993 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2994 /* do we need more space? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2995 Py_ssize_t need = j + reslen + len - i - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2996
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2997 /* check that didnt overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2998 if ((j > PY_SSIZE_T_MAX - reslen) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	2999 ((j + reslen) > PY_SSIZE_T_MAX - len) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3000 ((j + reslen + len) < i) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3001 ((j + reslen + len - i) <= 0)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3002 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3003 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3004 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3005
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3006 assert(need >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3007 assert(outlen >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3008
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3009 if (need > outlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3010 /* overallocate,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3011 to avoid reallocations */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3012 if (need < 2 * outlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3013 if (outlen > PY_SSIZE_T_MAX / 2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3014 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3015 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3016 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3017 need = 2 * outlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3018 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3019 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3020
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3021 if (PyUnicode_Resize(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3022 &result, need) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3023 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3024 goto Fail_1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3025 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3026 outlen = need;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3027 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3028 memcpy(PyUnicode_AS_UNICODE(result) + j,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3029 PyUnicode_AS_UNICODE(item),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3030 reslen*sizeof(Py_UNICODE));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3031 j += reslen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3032 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3033 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3034 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3035 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3036
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3037 if (j < outlen)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3038 PyUnicode_Resize(&result, j);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3039
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3040 return result;
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	3041
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	3042 Fail_1:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3043 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61360 diff changeset	3044 return NULL;
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	3045 }
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	3046 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/bltinmodule.c @ 78173:751f28564a45 2.7