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

annotate Python/bltinmodule.c @ 64223:7ff3fa429721

Issue 8403: Don't mask KeyboardInterrupt during peephole operation.

author	Raymond Hettinger <python@rcn.com>
date	Sun, 22 Aug 2010 08:39:49 +0000
parents	846866aa0eb6
children	2de9d4457082

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"
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45738 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>
c72c7e1930b3 Keep gcc -Wall and Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5223 diff changeset	11
61593 47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	12 #ifdef HAVE_LANGINFO_H
47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	13 #include <langinfo.h> /* CODESET */
47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	14 #endif
47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	15
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	16 /* 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	17 Can remain NULL for all platforms that don't have such a concept
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43487 diff changeset	18
19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43487 diff changeset	19 Don't forget to modify PyUnicode_DecodeFSDefault() if you touch any of the
19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43487 diff changeset	20 values for Py_FileSystemDefaultEncoding!
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 */
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23868 diff changeset	22 #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	23 const char *Py_FileSystemDefaultEncoding = "mbcs";
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	24 int Py_HasFileSystemDefaultEncoding = 1;
27782 904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	25 #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	26 const char *Py_FileSystemDefaultEncoding = "utf-8";
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	27 int Py_HasFileSystemDefaultEncoding = 1;
61593 47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	28 #elif defined(HAVE_LANGINFO_H) && defined(CODESET)
47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	29 const char Py_FileSystemDefaultEncoding = NULL; / set by initfsencoding() */
47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	30 int Py_HasFileSystemDefaultEncoding = 0;
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	31 #else
61593 47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	32 const char *Py_FileSystemDefaultEncoding = "utf-8";
47b4da86b9b9 Issue #8610: Load file system codec at startup, and display a fatal error on Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	33 int Py_HasFileSystemDefaultEncoding = 1;
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	34 #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	35
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	36 int
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	37 _Py_SetFileSystemEncoding(PyObject *s)
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	38 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	39 PyObject defenc, codec;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	40 if (!PyUnicode_Check(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	41 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	42 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	43 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	44 defenc = _PyUnicode_AsDefaultEncodedString(s, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	45 if (!defenc)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	46 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	47 codec = _PyCodec_Lookup(PyBytes_AsString(defenc));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	48 if (codec == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	49 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	50 Py_DECREF(codec);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	51 if (!Py_HasFileSystemDefaultEncoding && Py_FileSystemDefaultEncoding)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	52 /* A file system encoding was set at run-time */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	53 free((char*)Py_FileSystemDefaultEncoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	54 Py_FileSystemDefaultEncoding = strdup(PyBytes_AsString(defenc));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	55 Py_HasFileSystemDefaultEncoding = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	56 return 0;
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	57 }
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 49261 diff changeset	58
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	59 static PyObject *
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	60 builtin___build_class__(PyObject self, PyObject args, PyObject *kwds)
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	61 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	62 PyObject func, name, bases, mkw, meta, prep, ns, cell;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	63 PyObject *cls = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	64 Py_ssize_t nargs, nbases;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	65
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	66 assert(args != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	67 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	68 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	69 "__build_class__: args is not a tuple");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	70 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	71 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	72 nargs = PyTuple_GET_SIZE(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	73 if (nargs < 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	74 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	75 "__build_class__: not enough arguments");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	76 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	77 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	78 func = PyTuple_GET_ITEM(args, 0); /* Better be callable */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	79 name = PyTuple_GET_ITEM(args, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	80 if (!PyUnicode_Check(name)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	81 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	82 "__build_class__: name is not a string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	83 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	84 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	85 bases = PyTuple_GetSlice(args, 2, nargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	86 if (bases == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	87 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	88 nbases = nargs - 2;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	89
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	90 if (kwds == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	91 meta = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	92 mkw = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	93 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	94 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	95 mkw = PyDict_Copy(kwds); /* Don't modify kwds passed in! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	96 if (mkw == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	97 Py_DECREF(bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	98 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	99 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	100 meta = PyDict_GetItemString(mkw, "metaclass");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	101 if (meta != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	102 Py_INCREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	103 if (PyDict_DelItemString(mkw, "metaclass") < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	104 Py_DECREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	105 Py_DECREF(mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	106 Py_DECREF(bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	107 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	108 }
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	109 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	110 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	111 if (meta == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	112 if (PyTuple_GET_SIZE(bases) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	113 meta = (PyObject *) (&PyType_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	114 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	115 PyObject *base0 = PyTuple_GET_ITEM(bases, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	116 meta = (PyObject *) (base0->ob_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	117 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	118 Py_INCREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	119 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	120 prep = PyObject_GetAttrString(meta, "__prepare__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	121 if (prep == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	122 if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	123 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	124 ns = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	125 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	126 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	127 Py_DECREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	128 Py_XDECREF(mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	129 Py_DECREF(bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	130 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	131 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	132 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	133 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	134 PyObject *pargs = PyTuple_Pack(2, name, bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	135 if (pargs == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	136 Py_DECREF(prep);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	137 Py_DECREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	138 Py_XDECREF(mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	139 Py_DECREF(bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	140 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	141 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	142 ns = PyEval_CallObjectWithKeywords(prep, pargs, mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	143 Py_DECREF(pargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	144 Py_DECREF(prep);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	145 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	146 if (ns == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	147 Py_DECREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	148 Py_XDECREF(mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	149 Py_DECREF(bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	150 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	151 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	152 cell = PyObject_CallFunctionObjArgs(func, ns, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	153 if (cell != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	154 PyObject *margs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	155 margs = PyTuple_Pack(3, name, bases, ns);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	156 if (margs != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	157 cls = PyEval_CallObjectWithKeywords(meta, margs, mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	158 Py_DECREF(margs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	159 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	160 if (cls != NULL && PyCell_Check(cell)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	161 Py_INCREF(cls);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	162 PyCell_SET(cell, cls);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	163 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	164 Py_DECREF(cell);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	165 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	166 Py_DECREF(ns);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	167 Py_DECREF(meta);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	168 Py_XDECREF(mkw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	169 Py_DECREF(bases);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	170 return cls;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	171 }
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	172
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	173 PyDoc_STRVAR(build_class_doc,
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	174 "__build_class__(func, name, bases, metaclass=None, *kwds) -> class\n\
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	175 \n\
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	176 Internal helper function used by the class statement.");
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	177
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 41107 diff changeset	178 static PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	179 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	180 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	181 static char *kwlist[] = {"name", "globals", "locals", "fromlist",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	182 "level", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	183 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	184 PyObject *globals = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	185 PyObject *locals = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	186 PyObject *fromlist = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	187 int level = -1;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	188
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	189 if (!PyArg_ParseTupleAndKeywords(args, kwds, "s\|OOOi:__import__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	190 kwlist, &name, &globals, &locals, &fromlist, &level))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	191 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	192 return PyImport_ImportModuleLevel(name, globals, locals,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	193 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	194 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	195
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	196 PyDoc_STRVAR(import_doc,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	197 "__import__(name, globals={}, locals={}, fromlist=[], level=-1) -> module\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	198 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	199 Import a module. The globals are only used to determine the context;\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	200 they are not modified. The locals are currently unused. The fromlist\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	201 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	202 empty list to emulate ``import name''.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	203 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	204 returns package A when fromlist is empty, but its submodule B when\n\
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	205 fromlist is not empty. Level is used to determine whether to perform \n\
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	206 absolute or relative imports. -1 is the original strategy of attempting\n\
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	207 both absolute and relative imports, 0 is absolute, a positive number\n\
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	208 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	209
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	210
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	211 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	212 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	213 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	214 return PyNumber_Absolute(v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	215 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	216
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	217 PyDoc_STRVAR(abs_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	218 "abs(number) -> number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	219 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	220 Return the absolute value of the argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	221
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	222 static PyObject *
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	223 builtin_all(PyObject self, PyObject v)
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	224 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	225 PyObject it, item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	226 PyObject (iternext)(PyObject *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	227 int cmp;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	228
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	229 it = PyObject_GetIter(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	230 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	231 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	232 iternext = *Py_TYPE(it)->tp_iternext;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	233
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	234 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	235 item = iternext(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	236 if (item == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	237 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	238 cmp = PyObject_IsTrue(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	239 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	240 if (cmp < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	241 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	242 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	243 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	244 if (cmp == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	245 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	246 Py_RETURN_FALSE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	247 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	248 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	249 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	250 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	251 if (PyErr_ExceptionMatches(PyExc_StopIteration))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	252 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	253 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	254 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	255 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	256 Py_RETURN_TRUE;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	257 }
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	258
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	259 PyDoc_STRVAR(all_doc,
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	260 "all(iterable) -> bool\n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	261 \n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	262 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	263
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	264 static PyObject *
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	265 builtin_any(PyObject self, PyObject v)
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	266 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	267 PyObject it, item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	268 PyObject (iternext)(PyObject *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	269 int cmp;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	270
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	271 it = PyObject_GetIter(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	272 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	273 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	274 iternext = *Py_TYPE(it)->tp_iternext;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	275
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	276 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	277 item = iternext(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	278 if (item == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	279 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	280 cmp = PyObject_IsTrue(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	281 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	282 if (cmp < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	283 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	284 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	285 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	286 if (cmp == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	287 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	288 Py_RETURN_TRUE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	289 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	290 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	291 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	292 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	293 if (PyErr_ExceptionMatches(PyExc_StopIteration))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	294 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	295 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	296 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	297 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	298 Py_RETURN_FALSE;
34736 81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	299 }
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	300
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	301 PyDoc_STRVAR(any_doc,
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	302 "any(iterable) -> bool\n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	303 \n\
81b5a13fa38a Add two new functions, any() and all(). Raymond Hettinger <python@rcn.com> parents: 34123 diff changeset	304 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	305
47611 da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	306 static PyObject *
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	307 builtin_ascii(PyObject self, PyObject v)
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	308 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	309 return PyObject_ASCII(v);
47611 da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	310 }
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	311
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	312 PyDoc_STRVAR(ascii_doc,
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	313 "ascii(object) -> string\n\
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	314 \n\
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	315 As repr(), return a string containing a printable representation of an\n\
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	316 object, but escape the non-ASCII characters in the string returned by\n\
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	317 repr() using \\x, \\u or \\U escapes. This generates a string similar\n\
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	318 to that returned by repr() in Python 2.");
da47e7e135ae #2630: Implement PEP 3138. Georg Brandl <georg@python.org> parents: 47580 diff changeset	319
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	320
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	321 static PyObject *
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	322 builtin_bin(PyObject self, PyObject v)
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	323 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	324 return PyNumber_ToBase(v, 2);
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	325 }
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	326
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	327 PyDoc_STRVAR(bin_doc,
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	328 "bin(number) -> string\n\
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	329 \n\
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	330 Return the binary representation of an integer or long integer.");
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	331
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	332
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	333 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	334 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	335 PyObject *func;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	336 PyObject *it;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	337 } filterobject;
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	338
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42071 diff changeset	339 static PyObject *
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	340 filter_new(PyTypeObject type, PyObject args, PyObject *kwds)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	341 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	342 PyObject func, seq;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	343 PyObject *it;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	344 filterobject *lz;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	345
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	346 if (type == &PyFilter_Type && !_PyArg_NoKeywords("filter()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	347 return NULL;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	348
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	349 if (!PyArg_UnpackTuple(args, "filter", 2, 2, &func, &seq))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	350 return NULL;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	351
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	352 /* Get iterator. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	353 it = PyObject_GetIter(seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	354 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	355 return NULL;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	356
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	357 /* create filterobject structure */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	358 lz = (filterobject *)type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	359 if (lz == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	360 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	361 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	362 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	363 Py_INCREF(func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	364 lz->func = func;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	365 lz->it = it;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	366
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	367 return (PyObject *)lz;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	368 }
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	369
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	370 static void
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	371 filter_dealloc(filterobject *lz)
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	372 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	373 PyObject_GC_UnTrack(lz);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	374 Py_XDECREF(lz->func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	375 Py_XDECREF(lz->it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	376 Py_TYPE(lz)->tp_free(lz);
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	377 }
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	378
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	379 static int
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	380 filter_traverse(filterobject lz, visitproc visit, void arg)
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	381 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	382 Py_VISIT(lz->it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	383 Py_VISIT(lz->func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	384 return 0;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	385 }
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	386
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	387 static PyObject *
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	388 filter_next(filterobject *lz)
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	389 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	390 PyObject *item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	391 PyObject *it = lz->it;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	392 long ok;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	393 PyObject (iternext)(PyObject *);
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	394
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	395 iternext = *Py_TYPE(it)->tp_iternext;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	396 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	397 item = iternext(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	398 if (item == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	399 return NULL;
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	400
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	401 if (lz->func == Py_None \|\| lz->func == (PyObject *)&PyBool_Type) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	402 ok = PyObject_IsTrue(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	403 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	404 PyObject *good;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	405 good = PyObject_CallFunctionObjArgs(lz->func,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	406 item, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	407 if (good == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	408 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	409 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	410 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	411 ok = PyObject_IsTrue(good);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	412 Py_DECREF(good);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	413 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	414 if (ok)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	415 return item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	416 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	417 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	418 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	419
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	420 PyDoc_STRVAR(filter_doc,
47097 b2403d470b69 Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings. Georg Brandl <georg@python.org> parents: 47080 diff changeset	421 "filter(function or None, iterable) --> filter object\n\
42142 a53e48be6df9 Merged revisions 56125-56153 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	422 \n\
47097 b2403d470b69 Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings. Georg Brandl <georg@python.org> parents: 47080 diff changeset	423 Return an iterator yielding those items of iterable for which function(item)\n\
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	424 is true. If function is None, return the items that are true.");
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	425
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	426 PyTypeObject PyFilter_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	427 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	428 "filter", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	429 sizeof(filterobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	430 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	431 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	432 (destructor)filter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	433 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	434 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	435 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	436 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	437 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	438 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	439 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	440 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	441 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	442 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	443 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	444 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	445 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	446 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	447 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	448 Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	449 filter_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	450 (traverseproc)filter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	451 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	452 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	453 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	454 PyObject_SelfIter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	455 (iternextfunc)filter_next, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	456 0, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	457 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	458 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	459 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	460 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	461 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	462 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	463 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	464 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	465 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	466 filter_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	467 PyObject_GC_Del, /* tp_free */
45734 e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	468 };
e09bc1c5295b Issue 2186 and 2187. Move filter from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45382 diff changeset	469
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	470
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	471 static PyObject *
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	472 builtin_format(PyObject self, PyObject args)
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	473 {
44273 eb2260dcb365 Fixed #1593 spacing of the builtin_format function is inconsistent. Thanks to Joseph for the fix Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	474 PyObject *value;
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45086 diff changeset	475 PyObject *format_spec = NULL;
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	476
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45086 diff changeset	477 if (!PyArg_ParseTuple(args, "O\|U:format", &value, &format_spec))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	478 return NULL;
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	479
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45086 diff changeset	480 return PyObject_Format(value, format_spec);
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	481 }
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	482
43110 cdb7b9f82cc4 Added test cases for string.Formatter subclassing. Eric Smith <eric@trueblade.com> parents: 42899 diff changeset	483 PyDoc_STRVAR(format_doc,
cdb7b9f82cc4 Added test cases for string.Formatter subclassing. Eric Smith <eric@trueblade.com> parents: 42899 diff changeset	484 "format(value[, format_spec]) -> string\n\
cdb7b9f82cc4 Added test cases for string.Formatter subclassing. Eric Smith <eric@trueblade.com> parents: 42899 diff changeset	485 \n\
cdb7b9f82cc4 Added test cases for string.Formatter subclassing. Eric Smith <eric@trueblade.com> parents: 42899 diff changeset	486 Returns value.__format__(format_spec)\n\
cdb7b9f82cc4 Added test cases for string.Formatter subclassing. Eric Smith <eric@trueblade.com> parents: 42899 diff changeset	487 format_spec defaults to \"\"");
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42760 diff changeset	488
41609 92ead87bf984 Add 8-bit chr() back as chr8(). Guido van Rossum <guido@python.org> parents: 41595 diff changeset	489 static PyObject *
41955 4c5fbe65b7de Make the name of the C variables match the Python names Walter Dörwald <walter@livinglogic.de> parents: 41888 diff changeset	490 builtin_chr(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	491 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	492 int x;
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	493
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	494 if (!PyArg_ParseTuple(args, "i:chr", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	495 return NULL;
18282 f38923ce3c6b more unicode tweaks: make unichr(0xdddddddd) behave like u"\Udddddddd" Fredrik Lundh <fredrik@pythonware.com> parents: 18281 diff changeset	496
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	497 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	498 }
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	499
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	500 PyDoc_VAR(chr_doc) = PyDoc_STR(
41585 825d966338ea Rename 'unicode' to 'str' in its tp_name field. Rename 'str' to 'str8'. Guido van Rossum <guido@python.org> parents: 41558 diff changeset	501 "chr(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	502 \n\
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	503 Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff."
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	504 )
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	505 #ifndef Py_UNICODE_WIDE
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	506 PyDoc_STR(
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	507 "\nIf 0x10000 <= i, a surrogate pair is returned."
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	508 )
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	509 #endif
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	510 ;
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	511
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	512
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	513 static char *
51956 8fe2988cf550 ignore the coding cookie in compile(), exec(), and eval() if the source is a string #4626 Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	514 source_as_string(PyObject cmd, char funcname, char what, PyCompilerFlags cf)
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	515 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	516 char *str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	517 Py_ssize_t size;
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	518
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	519 if (PyUnicode_Check(cmd)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	520 cf->cf_flags \|= PyCF_IGNORE_COOKIE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	521 cmd = _PyUnicode_AsDefaultEncodedString(cmd, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	522 if (cmd == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	523 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	524 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	525 else if (!PyObject_CheckReadBuffer(cmd)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	526 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	527 "%s() arg 1 must be a %s object",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	528 funcname, what);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	529 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	530 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	531 if (PyObject_AsReadBuffer(cmd, (const void **)&str, &size) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	532 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	533 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	534 if (strlen(str) != size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	535 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	536 "source code string cannot contain null bytes");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	537 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	538 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	539 return str;
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	540 }
2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	541
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	542 static PyObject *
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41501 diff changeset	543 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	544 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	545 char *str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	546 char *filename;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	547 char *startstr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	548 int mode = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	549 int dont_inherit = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	550 int supplied_flags = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	551 int is_ast;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	552 PyCompilerFlags cf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	553 PyObject *cmd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	554 static char *kwlist[] = {"source", "filename", "mode", "flags",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	555 "dont_inherit", NULL};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	556 int start[] = {Py_file_input, Py_eval_input, Py_single_input};
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	557
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	558 if (!PyArg_ParseTupleAndKeywords(args, kwds, "Oss\|ii:compile",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	559 kwlist, &cmd, &filename, &startstr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	560 &supplied_flags, &dont_inherit))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	561 return NULL;
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	562
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	563 cf.cf_flags = supplied_flags \| PyCF_SOURCE_IS_UTF8;
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	564
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	565 if (supplied_flags &
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	566 ~(PyCF_MASK \| PyCF_MASK_OBSOLETE \| PyCF_DONT_IMPLY_DEDENT \| PyCF_ONLY_AST))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	567 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	568 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	569 "compile(): unrecognised flags");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	570 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	571 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	572 /* XXX Warn if (supplied_flags & PyCF_MASK_OBSOLETE) != 0? */
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	573
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	574 if (!dont_inherit) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	575 PyEval_MergeCompilerFlags(&cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	576 }
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45738 diff changeset	577
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	578 if (strcmp(startstr, "exec") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	579 mode = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	580 else if (strcmp(startstr, "eval") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	581 mode = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	582 else if (strcmp(startstr, "single") == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	583 mode = 2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	584 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	585 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	586 "compile() arg 3 must be 'exec', 'eval' or 'single'");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	587 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	588 }
46227 b2d93a960b98 Merged revisions 62039-62042 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46208 diff changeset	589
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	590 is_ast = PyAST_Check(cmd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	591 if (is_ast == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	592 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	593 if (is_ast) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	594 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	595 if (supplied_flags & PyCF_ONLY_AST) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	596 Py_INCREF(cmd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	597 result = cmd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	598 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	599 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	600 PyArena *arena;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	601 mod_ty mod;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45738 diff changeset	602
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	603 arena = PyArena_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	604 mod = PyAST_obj2mod(cmd, arena, mode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	605 if (mod == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	606 PyArena_Free(arena);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	607 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	608 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	609 result = (PyObject*)PyAST_Compile(mod, filename,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	610 &cf, arena);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	611 PyArena_Free(arena);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	612 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	613 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	614 }
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45738 diff changeset	615
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	616 str = source_as_string(cmd, "compile", "string, bytes, AST or code", &cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	617 if (str == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	618 return NULL;
46208 ea75b12fe8e7 Merged revisions 62004 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45738 diff changeset	619
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	620 return Py_CompileStringFlags(str, filename, start[mode], &cf);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	621 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	622
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	623 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	624 "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	625 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	626 Compile the source string (a Python module, statement or expression)\n\
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	627 into a code object that can be executed by exec() or eval().\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	628 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	629 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	630 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	631 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	632 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	633 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	634 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	635 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	636 in addition to any features explicitly specified.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	637
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	638 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	639 builtin_dir(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	640 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	641 PyObject *arg = NULL;
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	642
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	643 if (!PyArg_UnpackTuple(args, "dir", 0, 1, &arg))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	644 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	645 return PyObject_Dir(arg);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	646 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	647
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	648 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	649 "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	650 "\n"
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	651 "If called without an argument, return the names in the current scope.\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	652 "Else, return an alphabetized list of names comprising (some of) the attributes\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	653 "of the given object, and of attributes reachable from it.\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	654 "If the object supplies a method named __dir__, it will be used; otherwise\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	655 "the default dir() logic is used and returns:\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	656 " for a module object: the module's attributes.\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	657 " for a class object: its attributes, and recursively the attributes\n"
cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	658 " of its bases.\n"
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41501 diff changeset	659 " for any other object: its attributes, its class's attributes, and\n"
41107 cf452027073e Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Georg Brandl <georg@python.org> parents: 40933 diff changeset	660 " recursively the attributes of its class's base classes.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	661
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	662 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	663 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	664 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	665 PyObject v, w;
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	666
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	667 if (!PyArg_UnpackTuple(args, "divmod", 2, 2, &v, &w))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	668 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	669 return PyNumber_Divmod(v, w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	670 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	671
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	672 PyDoc_STRVAR(divmod_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	673 "divmod(x, y) -> (div, mod)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	674 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	675 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	676
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	677
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	678 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	679 builtin_eval(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	680 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	681 PyObject cmd, result, *tmp = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	682 PyObject globals = Py_None, locals = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	683 char *str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	684 PyCompilerFlags cf;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	685
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	686 if (!PyArg_UnpackTuple(args, "eval", 1, 3, &cmd, &globals, &locals))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	687 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	688 if (locals != Py_None && !PyMapping_Check(locals)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	689 PyErr_SetString(PyExc_TypeError, "locals must be a mapping");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	690 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	691 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	692 if (globals != Py_None && !PyDict_Check(globals)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	693 PyErr_SetString(PyExc_TypeError, PyMapping_Check(globals) ?
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	694 "globals must be a real dict; try eval(expr, {}, mapping)"
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	695 : "globals must be a dict");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	696 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	697 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	698 if (globals == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	699 globals = PyEval_GetGlobals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	700 if (locals == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	701 locals = PyEval_GetLocals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	702 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	703 else if (locals == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	704 locals = globals;
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	705
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	706 if (globals == NULL \|\| locals == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	707 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	708 "eval must be given globals and locals "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	709 "when called without a frame");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	710 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	711 }
35567 fa0881fd49b7 bug [ 868706 ] Calling builtin function 'eval' from C causes seg fault. Georg Brandl <georg@python.org> parents: 35500 diff changeset	712
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	713 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	714 if (PyDict_SetItemString(globals, "__builtins__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	715 PyEval_GetBuiltins()) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	716 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	717 }
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	718
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	719 if (PyCode_Check(cmd)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	720 if (PyCode_GetNumFree((PyCodeObject *)cmd) > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	721 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	722 "code object passed to eval() may not contain free variables");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	723 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	724 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	725 return PyEval_EvalCode((PyCodeObject *) cmd, globals, locals);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	726 }
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	727
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	728 cf.cf_flags = PyCF_SOURCE_IS_UTF8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	729 str = source_as_string(cmd, "eval", "string, bytes or code", &cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	730 if (str == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	731 return NULL;
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	732
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	733 while (str == ' ' \|\| str == '\t')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	734 str++;
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	735
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	736 (void)PyEval_MergeCompilerFlags(&cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	737 result = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	738 Py_XDECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	739 return result;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	740 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	741
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	742 PyDoc_STRVAR(eval_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	743 "eval(source[, globals[, locals]]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	744 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	745 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	746 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	747 or a code object as returned by compile().\n\
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40411 diff changeset	748 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	749 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	750 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	751
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	752 static PyObject *
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	753 builtin_exec(PyObject self, PyObject args)
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	754 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	755 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	756 PyObject prog, globals = Py_None, *locals = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	757 int plain = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	758
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	759 if (!PyArg_UnpackTuple(args, "exec", 1, 3, &prog, &globals, &locals))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	760 return NULL;
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	761
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	762 if (globals == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	763 globals = PyEval_GetGlobals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	764 if (locals == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	765 locals = PyEval_GetLocals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	766 plain = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	767 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	768 if (!globals \|\| !locals) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	769 PyErr_SetString(PyExc_SystemError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	770 "globals and locals cannot be NULL");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	771 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	772 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	773 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	774 else if (locals == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	775 locals = globals;
48883 f27ccfdea834 #3706: fix error message for wrong exec() argument type. R=Guido. Georg Brandl <georg@python.org> parents: 48660 diff changeset	776
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	777 if (!PyDict_Check(globals)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	778 PyErr_Format(PyExc_TypeError, "exec() arg 2 must be a dict, not %.100s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	779 globals->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	780 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	781 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	782 if (!PyMapping_Check(locals)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	783 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	784 "arg 3 must be a mapping or None, not %.100s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	785 locals->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	786 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	787 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	788 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	789 if (PyDict_SetItemString(globals, "__builtins__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	790 PyEval_GetBuiltins()) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	791 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	792 }
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	793
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	794 if (PyCode_Check(prog)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	795 if (PyCode_GetNumFree((PyCodeObject *)prog) > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	796 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	797 "code object passed to exec() may not "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	798 "contain free variables");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	799 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	800 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	801 v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	802 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	803 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	804 char *str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	805 PyCompilerFlags cf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	806 cf.cf_flags = PyCF_SOURCE_IS_UTF8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	807 str = source_as_string(prog, "exec",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	808 "string, bytes or code", &cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	809 if (str == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	810 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	811 if (PyEval_MergeCompilerFlags(&cf))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	812 v = PyRun_StringFlags(str, Py_file_input, globals,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	813 locals, &cf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	814 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	815 v = PyRun_String(str, Py_file_input, globals, locals);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	816 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	817 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	818 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	819 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	820 Py_RETURN_NONE;
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	821 }
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	822
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	823 PyDoc_STRVAR(exec_doc,
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	824 "exec(object[, globals[, locals]])\n\
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	825 \n\
57793 a08840ce88d3 Fix typo (reported by terlop on IRC) Mark Dickinson <dickinsm@gmail.com> parents: 57675 diff changeset	826 Read and execute code from an object, which can be a string or a code\n\
50586 1146b7b0d518 #4826 exec() doesn't take a file object anymore Benjamin Peterson <benjamin@python.org> parents: 50076 diff changeset	827 object.\n\
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	828 The globals and locals are dictionaries, defaulting to the current\n\
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	829 globals and locals. If only globals is given, locals defaults to it.");
c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39686 diff changeset	830
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	831
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	832 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	833 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	834 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	835 PyObject v, result, *dflt = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	836 PyObject *name;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	837
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	838 if (!PyArg_UnpackTuple(args, "getattr", 2, 3, &v, &name, &dflt))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	839 return NULL;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	840
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	841 if (!PyUnicode_Check(name)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	842 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	843 "getattr(): attribute name must be string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	844 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	845 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	846 result = PyObject_GetAttr(v, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	847 if (result == NULL && dflt != NULL &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	848 PyErr_ExceptionMatches(PyExc_AttributeError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	849 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	850 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	851 Py_INCREF(dflt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	852 result = dflt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	853 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	854 return result;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	855 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	856
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	857 PyDoc_STRVAR(getattr_doc,
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	858 "getattr(object, name[, default]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	859 \n\
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	860 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	861 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	862 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	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 *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	866 builtin_globals(PyObject *self)
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	867 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	868 PyObject *d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	869
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	870 d = PyEval_GetGlobals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	871 Py_XINCREF(d);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	872 return d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	873 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	874
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	875 PyDoc_STRVAR(globals_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	876 "globals() -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	877 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	878 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	879
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	880
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	881 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	882 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	883 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	884 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	885 PyObject *name;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	886
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	887 if (!PyArg_UnpackTuple(args, "hasattr", 2, 2, &v, &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	888 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	889 if (!PyUnicode_Check(name)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	890 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	891 "hasattr(): attribute name must be string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	892 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	893 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	894 v = PyObject_GetAttr(v, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	895 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	896 if (!PyErr_ExceptionMatches(PyExc_Exception))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	897 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	898 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	899 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	900 Py_INCREF(Py_False);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	901 return Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	902 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	903 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	904 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	905 Py_INCREF(Py_True);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	906 return Py_True;
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	907 }
59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	908
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	909 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	910 "hasattr(object, name) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	911 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	912 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	913 (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	914
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	915
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	916 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	917 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	918 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	919 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	920 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	921
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	922 PyDoc_STRVAR(id_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	923 "id(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	924 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	925 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	926 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	927
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	928
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	929 /* map object ************************************************************/
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	930
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	931 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	932 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	933 PyObject *iters;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	934 PyObject *func;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	935 } mapobject;
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	936
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	937 static PyObject *
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	938 map_new(PyTypeObject type, PyObject args, PyObject *kwds)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	939 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	940 PyObject it, iters, *func;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	941 mapobject *lz;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	942 Py_ssize_t numargs, i;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	943
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	944 if (type == &PyMap_Type && !_PyArg_NoKeywords("map()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	945 return NULL;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	946
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	947 numargs = PyTuple_Size(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	948 if (numargs < 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	949 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	950 "map() must have at least two arguments.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	951 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	952 }
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	953
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	954 iters = PyTuple_New(numargs-1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	955 if (iters == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	956 return NULL;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	957
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	958 for (i=1 ; i<numargs ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	959 /* Get iterator. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	960 it = PyObject_GetIter(PyTuple_GET_ITEM(args, i));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	961 if (it == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	962 Py_DECREF(iters);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	963 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	964 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	965 PyTuple_SET_ITEM(iters, i-1, it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	966 }
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	967
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	968 /* create mapobject structure */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	969 lz = (mapobject *)type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	970 if (lz == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	971 Py_DECREF(iters);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	972 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	973 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	974 lz->iters = iters;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	975 func = PyTuple_GET_ITEM(args, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	976 Py_INCREF(func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	977 lz->func = func;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	978
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	979 return (PyObject *)lz;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	980 }
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	981
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	982 static void
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	983 map_dealloc(mapobject *lz)
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	984 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	985 PyObject_GC_UnTrack(lz);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	986 Py_XDECREF(lz->iters);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	987 Py_XDECREF(lz->func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	988 Py_TYPE(lz)->tp_free(lz);
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	989 }
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	990
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	991 static int
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	992 map_traverse(mapobject lz, visitproc visit, void arg)
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	993 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	994 Py_VISIT(lz->iters);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	995 Py_VISIT(lz->func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	996 return 0;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	997 }
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	998
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	999 static PyObject *
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1000 map_next(mapobject *lz)
7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1001 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1002 PyObject *val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1003 PyObject *argtuple;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1004 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1005 Py_ssize_t numargs, i;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1006
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1007 numargs = PyTuple_Size(lz->iters);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1008 argtuple = PyTuple_New(numargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1009 if (argtuple == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1010 return NULL;
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1011
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1012 for (i=0 ; i<numargs ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1013 val = PyIter_Next(PyTuple_GET_ITEM(lz->iters, i));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1014 if (val == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1015 Py_DECREF(argtuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1016 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1017 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1018 PyTuple_SET_ITEM(argtuple, i, val);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1019 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1020 result = PyObject_Call(lz->func, argtuple, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1021 Py_DECREF(argtuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1022 return result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1023 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1024
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1025 PyDoc_STRVAR(map_doc,
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1026 "map(func, *iterables) --> map object\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1027 \n\
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1028 Make an iterator that computes the function using arguments from\n\
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1029 each of the iterables. Stops when the shortest iterable is exhausted.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1030
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1031 PyTypeObject PyMap_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1032 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1033 "map", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1034 sizeof(mapobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1035 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1036 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1037 (destructor)map_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1038 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1039 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1040 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1041 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1042 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1043 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1044 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1045 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1046 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1047 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1048 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1049 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1050 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1051 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1052 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1053 Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1054 map_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1055 (traverseproc)map_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1056 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1057 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1058 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1059 PyObject_SelfIter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1060 (iternextfunc)map_next, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1061 0, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1062 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1063 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1064 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1065 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1066 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1067 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1068 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1069 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1070 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1071 map_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1072 PyObject_GC_Del, /* tp_free */
45735 7adaab64eb72 Issues 2186 and 2187. Move map() from itertools to builtins. Raymond Hettinger <python@rcn.com> parents: 45734 diff changeset	1073 };
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1074
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1075 static PyObject *
41501 0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1076 builtin_next(PyObject self, PyObject args)
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1077 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1078 PyObject it, res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1079 PyObject *def = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1080
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1081 if (!PyArg_UnpackTuple(args, "next", 1, 2, &it, &def))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1082 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1083 if (!PyIter_Check(it)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1084 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1085 "%.200s object is not an iterator",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1086 it->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1087 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1088 }
41501 0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1089
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1090 res = (*it->ob_type->tp_iternext)(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1091 if (res != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1092 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1093 } else if (def != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1094 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1095 if(!PyErr_ExceptionMatches(PyExc_StopIteration))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1096 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1097 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1098 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1099 Py_INCREF(def);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1100 return def;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1101 } else if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1102 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1103 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1104 PyErr_SetNone(PyExc_StopIteration);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1105 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1106 }
41501 0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1107 }
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1108
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1109 PyDoc_STRVAR(next_doc,
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1110 "next(iterator[, default])\n\
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1111 \n\
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1112 Return the next item from the iterator. If default is given and the iterator\n\
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1113 is exhausted, it is returned instead of raising StopIteration.");
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1114
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1115
0c5019afc55b PEP 3114: rename .next() to .__next__() and add next() builtin. Georg Brandl <georg@python.org> parents: 41452 diff changeset	1116 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1117 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	1118 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1119 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1120 PyObject *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1121 PyObject *value;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1122
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1123 if (!PyArg_UnpackTuple(args, "setattr", 3, 3, &v, &name, &value))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1124 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1125 if (PyObject_SetAttr(v, name, value) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1126 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1127 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1128 return Py_None;
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	1129 }
59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	1130
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1131 PyDoc_STRVAR(setattr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1132 "setattr(object, name, value)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1133 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1134 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	1135 ``x.y = v''.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1136
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1137
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1138 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1139 builtin_delattr(PyObject self, PyObject args)
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	1140 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1141 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1142 PyObject *name;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1143
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1144 if (!PyArg_UnpackTuple(args, "delattr", 2, 2, &v, &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1145 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1146 if (PyObject_SetAttr(v, name, (PyObject *)NULL) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1147 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1148 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1149 return Py_None;
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	1150 }
8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	1151
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1152 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	1153 "delattr(object, name)\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1154 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1155 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	1156 ``del x.y''.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1157
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1158
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1159 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	1160 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	1161 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1162 long x;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1163
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1164 x = PyObject_Hash(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1165 if (x == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1166 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1167 return PyLong_FromLong(x);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1168 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1169
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1170 PyDoc_STRVAR(hash_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1171 "hash(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1172 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1173 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	1174 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	1175
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1176
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1177 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	1178 builtin_hex(PyObject self, PyObject v)
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1179 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1180 return PyNumber_ToBase(v, 16);
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1181 }
9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1182
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1183 PyDoc_STRVAR(hex_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1184 "hex(number) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1185 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1186 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	1187
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1188
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1189 static PyObject *
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1190 builtin_iter(PyObject self, PyObject args)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1191 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1192 PyObject v, w = NULL;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1193
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1194 if (!PyArg_UnpackTuple(args, "iter", 1, 2, &v, &w))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1195 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1196 if (w == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1197 return PyObject_GetIter(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1198 if (!PyCallable_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1199 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1200 "iter(v, w): v must be callable");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1201 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1202 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1203 return PyCallIter_New(v, w);
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1204 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1205
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1206 PyDoc_STRVAR(iter_doc,
47097 b2403d470b69 Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings. Georg Brandl <georg@python.org> parents: 47080 diff changeset	1207 "iter(iterable) -> iterator\n\
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1208 iter(callable, sentinel) -> iterator\n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1209 \n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1210 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	1211 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	1212 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	1213
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1214
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1215 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	1216 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	1217 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1218 Py_ssize_t res;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1219
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1220 res = PyObject_Size(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1221 if (res < 0 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1222 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1223 return PyLong_FromSsize_t(res);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1224 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1225
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1226 PyDoc_STRVAR(len_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1227 "len(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1228 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1229 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	1230
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1231
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1232 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	1233 builtin_locals(PyObject *self)
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1234 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1235 PyObject *d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1236
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1237 d = PyEval_GetLocals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1238 Py_XINCREF(d);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1239 return d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1240 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1241
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1242 PyDoc_STRVAR(locals_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1243 "locals() -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1244 \n\
27076 753306f9b0a0 SF bug #655271: Slightly modify locals() doc Raymond Hettinger <python@rcn.com> parents: 26824 diff changeset	1245 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	1246
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1247
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1248 static PyObject *
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1249 min_max(PyObject args, PyObject kwds, int op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1250 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1251 PyObject v, it, item, val, maxitem, maxval, *keyfunc=NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1252 const char *name = op == Py_LT ? "min" : "max";
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1253
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1254 if (PyTuple_Size(args) > 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1255 v = args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1256 else if (!PyArg_UnpackTuple(args, (char *)name, 1, 1, &v))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1257 return NULL;
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	1258
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1259 if (kwds != NULL && PyDict_Check(kwds) && PyDict_Size(kwds)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1260 keyfunc = PyDict_GetItemString(kwds, "key");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1261 if (PyDict_Size(kwds)!=1 \|\| keyfunc == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1262 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1263 "%s() got an unexpected keyword argument", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1264 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1265 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1266 Py_INCREF(keyfunc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1267 }
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1268
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1269 it = PyObject_GetIter(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1270 if (it == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1271 Py_XDECREF(keyfunc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1272 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1273 }
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1274
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1275 maxitem = NULL; /* the result */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1276 maxval = NULL; /* the value associated with the result */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1277 while (( item = PyIter_Next(it) )) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1278 /* get the value from the key function */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1279 if (keyfunc != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1280 val = PyObject_CallFunctionObjArgs(keyfunc, item, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1281 if (val == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1282 goto Fail_it_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1283 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1284 /* no key function; the value is the item */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1285 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1286 val = item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1287 Py_INCREF(val);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1288 }
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1289
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1290 /* maximum value and item are unset; set them */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1291 if (maxval == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1292 maxitem = item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1293 maxval = val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1294 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1295 /* maximum value and item are set; update them as necessary */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1296 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1297 int cmp = PyObject_RichCompareBool(val, maxval, op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1298 if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1299 goto Fail_it_item_and_val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1300 else if (cmp > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1301 Py_DECREF(maxval);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1302 Py_DECREF(maxitem);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1303 maxval = val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1304 maxitem = item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1305 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1306 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1307 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1308 Py_DECREF(val);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1309 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1310 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1311 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1312 if (PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1313 goto Fail_it;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1314 if (maxval == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1315 PyErr_Format(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1316 "%s() arg is an empty sequence", name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1317 assert(maxitem == NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1318 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1319 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1320 Py_DECREF(maxval);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1321 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1322 Py_XDECREF(keyfunc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1323 return maxitem;
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1324
cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1325 Fail_it_item_and_val:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1326 Py_DECREF(val);
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1327 Fail_it_item:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1328 Py_DECREF(item);
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1329 Fail_it:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1330 Py_XDECREF(maxval);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1331 Py_XDECREF(maxitem);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1332 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1333 Py_XDECREF(keyfunc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1334 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1335 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1336
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1337 static PyObject *
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1338 builtin_min(PyObject self, PyObject args, PyObject *kwds)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1339 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1340 return min_max(args, kwds, Py_LT);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1341 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1342
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1343 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	1344 "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	1345 min(a, b, c, ...[, key=func]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1346 \n\
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1347 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	1348 With two or more arguments, return the smallest argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1349
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1350
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1351 static PyObject *
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1352 builtin_max(PyObject self, PyObject args, PyObject *kwds)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1353 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1354 return min_max(args, kwds, Py_GT);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1355 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1356
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1357 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	1358 "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	1359 max(a, b, c, ...[, key=func]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1360 \n\
34085 cc9ce6837ea9 SF patch #1077353: add key= argument to min and max Raymond Hettinger <python@rcn.com> parents: 33261 diff changeset	1361 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	1362 With two or more arguments, return the largest argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1363
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1364
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1365 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	1366 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	1367 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1368 return PyNumber_ToBase(v, 8);
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1369 }
9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1370
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1371 PyDoc_STRVAR(oct_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1372 "oct(number) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1373 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1374 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	1375
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1376
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1377 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	1378 builtin_ord(PyObject self, PyObject obj)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1379 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1380 long ord;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1381 Py_ssize_t size;
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	1382
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1383 if (PyBytes_Check(obj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1384 size = PyBytes_GET_SIZE(obj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1385 if (size == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1386 ord = (long)((unsigned char)*PyBytes_AS_STRING(obj));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1387 return PyLong_FromLong(ord);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1388 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1389 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1390 else if (PyUnicode_Check(obj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1391 size = PyUnicode_GET_SIZE(obj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1392 if (size == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1393 ord = (long)*PyUnicode_AS_UNICODE(obj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1394 return PyLong_FromLong(ord);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1395 }
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1396 #ifndef Py_UNICODE_WIDE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1397 if (size == 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1398 /* Decode a valid surrogate pair */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1399 int c0 = PyUnicode_AS_UNICODE(obj)[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1400 int c1 = PyUnicode_AS_UNICODE(obj)[1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1401 if (0xD800 <= c0 && c0 <= 0xDBFF &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1402 0xDC00 <= c1 && c1 <= 0xDFFF) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1403 ord = ((((c0 & 0x03FF) << 10) \| (c1 & 0x03FF)) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1404 0x00010000);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1405 return PyLong_FromLong(ord);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1406 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1407 }
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1408 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1409 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1410 else if (PyByteArray_Check(obj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1411 /* XXX Hopefully this is temporary */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1412 size = PyByteArray_GET_SIZE(obj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1413 if (size == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1414 ord = (long)((unsigned char)*PyByteArray_AS_STRING(obj));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1415 return PyLong_FromLong(ord);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1416 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1417 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1418 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1419 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1420 "ord() expected string of length 1, but " \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1421 "%.200s found", obj->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1422 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1423 }
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	1424
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1425 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1426 "ord() expected a character, "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1427 "but string of length %zd found",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1428 size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1429 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1430 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1431
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	1432 PyDoc_VAR(ord_doc) = PyDoc_STR(
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1433 "ord(c) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1434 \n\
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1435 Return the integer ordinal of a one-character string."
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	1436 )
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1437 #ifndef Py_UNICODE_WIDE
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	1438 PyDoc_STR(
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1439 "\nA valid surrogate pair is also accepted."
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	1440 )
42283 18e5ae91bd29 Make chr() and ord() return/accept surrogate pairs in narrow builds. Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1441 #endif
42291 3772103200ec Three patches by Amaury Forgeot d'Arc; SF patch# 1754484. Guido van Rossum <guido@python.org> parents: 42283 diff changeset	1442 ;
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1443
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1444
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1445 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1446 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	1447 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1448 PyObject v, w, *z = Py_None;
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1449
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1450 if (!PyArg_UnpackTuple(args, "pow", 2, 3, &v, &w, &z))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1451 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1452 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	1453 }
6693c5d87f3a Added long() and support for longs in int() and float(); Guido van Rossum <guido@python.org> parents: 182 diff changeset	1454
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1455 PyDoc_STRVAR(pow_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1456 "pow(x, y[, z]) -> number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1457 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1458 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	1459 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	1460
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1461
28583 a0c002050526 Patch by Chad Netzer (with significant change): Guido van Rossum <guido@python.org> parents: 28513 diff changeset	1462
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1463 static PyObject *
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1464 builtin_print(PyObject self, PyObject args, PyObject *kwds)
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1465 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1466 static char *kwlist[] = {"sep", "end", "file", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1467 static PyObject *dummy_args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1468 PyObject sep = NULL, end = NULL, *file = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1469 int i, err;
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1470
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1471 if (dummy_args == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1472 if (!(dummy_args = PyTuple_New(0)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1473 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1474 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1475 if (!PyArg_ParseTupleAndKeywords(dummy_args, kwds, "\|OOO:print",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1476 kwlist, &sep, &end, &file))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1477 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1478 if (file == NULL \|\| file == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1479 file = PySys_GetObject("stdout");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1480 /* sys.stdout may be None when FILE* stdout isn't connected */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1481 if (file == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1482 Py_RETURN_NONE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1483 }
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1484
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1485 if (sep == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1486 sep = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1487 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1488 else if (sep && !PyUnicode_Check(sep)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1489 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1490 "sep must be None or a string, not %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1491 sep->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1492 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1493 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1494 if (end == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1495 end = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1496 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1497 else if (end && !PyUnicode_Check(end)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1498 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1499 "end must be None or a string, not %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1500 end->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1501 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1502 }
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1503
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1504 for (i = 0; i < PyTuple_Size(args); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1505 if (i > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1506 if (sep == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1507 err = PyFile_WriteString(" ", file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1508 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1509 err = PyFile_WriteObject(sep, file,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1510 Py_PRINT_RAW);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1511 if (err)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1512 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1513 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1514 err = PyFile_WriteObject(PyTuple_GetItem(args, i), file,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1515 Py_PRINT_RAW);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1516 if (err)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1517 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1518 }
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1519
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1520 if (end == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1521 err = PyFile_WriteString("\n", file);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1522 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1523 err = PyFile_WriteObject(end, file, Py_PRINT_RAW);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1524 if (err)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1525 return NULL;
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1526
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1527 Py_RETURN_NONE;
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1528 }
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1529
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1530 PyDoc_STRVAR(print_doc,
45086 7cb6e5617da0 Make print docstring consistent with its docs. Georg Brandl <georg@python.org> parents: 45082 diff changeset	1531 "print(value, ..., sep=' ', end='\\n', file=sys.stdout)\n\
40410 2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1532 \n\
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1533 Prints the values to a stream, or to sys.stdout by default.\n\
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1534 Optional keyword arguments:\n\
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1535 file: a file-like object (stream); defaults to the current sys.stdout.\n\
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1536 sep: string inserted between values, default a space.\n\
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1537 end: string appended after the last value, default a newline.");
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1538
2e5011acb414 Add built-in Print() function. This is PEP 3105 except for the name; Guido van Rossum <guido@python.org> parents: 39782 diff changeset	1539
40933 a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1540 static PyObject *
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1541 builtin_input(PyObject self, PyObject args)
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1542 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1543 PyObject *promptarg = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1544 PyObject *fin = PySys_GetObject("stdin");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1545 PyObject *fout = PySys_GetObject("stdout");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1546 PyObject *ferr = PySys_GetObject("stderr");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1547 PyObject *tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1548 long fd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1549 int tty;
40933 a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1550
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1551 /* Parse arguments */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1552 if (!PyArg_UnpackTuple(args, "input", 0, 1, &promptarg))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1553 return NULL;
40933 a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1554
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1555 /* Check that stdin/out/err are intact */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1556 if (fin == NULL \|\| fin == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1557 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1558 "input(): lost sys.stdin");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1559 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1560 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1561 if (fout == NULL \|\| fout == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1562 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1563 "input(): lost sys.stdout");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1564 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1565 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1566 if (ferr == NULL \|\| ferr == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1567 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1568 "input(): lost sys.stderr");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1569 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1570 }
41888 aa73206c9ce6 Make input9) behave properly with the new I/O library. Guido van Rossum <guido@python.org> parents: 41846 diff changeset	1571
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1572 /* First of all, flush stderr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1573 tmp = PyObject_CallMethod(ferr, "flush", "");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1574 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1575 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1576 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1577 Py_DECREF(tmp);
41888 aa73206c9ce6 Make input9) behave properly with the new I/O library. Guido van Rossum <guido@python.org> parents: 41846 diff changeset	1578
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1579 /* We should only use (GNU) readline if Python's sys.stdin and
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1580 sys.stdout are the same as C's stdin and stdout, because we
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1581 need to pass it those. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1582 tmp = PyObject_CallMethod(fin, "fileno", "");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1583 if (tmp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1584 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1585 tty = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1586 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1587 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1588 fd = PyLong_AsLong(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1589 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1590 if (fd < 0 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1591 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1592 tty = fd == fileno(stdin) && isatty(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1593 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1594 if (tty) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1595 tmp = PyObject_CallMethod(fout, "fileno", "");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1596 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1597 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1598 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1599 fd = PyLong_AsLong(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1600 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1601 if (fd < 0 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1602 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1603 tty = fd == fileno(stdout) && isatty(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1604 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1605 }
41888 aa73206c9ce6 Make input9) behave properly with the new I/O library. Guido van Rossum <guido@python.org> parents: 41846 diff changeset	1606
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1607 /* If we're interactive, use (GNU) readline */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1608 if (tty) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1609 PyObject *po;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1610 char *prompt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1611 char *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1612 PyObject *stdin_encoding;
61718 846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1613 char *stdin_encoding_str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1614 PyObject *result;
43216 a311ab2fc1a7 Decode input() with stdin.encoding. Fixes #1097. Martin v. Löwis <martin@v.loewis.de> parents: 43172 diff changeset	1615
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1616 stdin_encoding = PyObject_GetAttrString(fin, "encoding");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1617 if (!stdin_encoding)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1618 /* stdin is a text stream, so it must have an
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1619 encoding. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1620 return NULL;
61718 846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1621 stdin_encoding_str = _PyUnicode_AsString(stdin_encoding);
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1622 if (stdin_encoding_str == NULL) {
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1623 Py_DECREF(stdin_encoding);
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1624 return NULL;
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1625 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1626 tmp = PyObject_CallMethod(fout, "flush", "");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1627 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1628 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1629 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1630 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1631 if (promptarg != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1632 PyObject *stringpo;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1633 PyObject *stdout_encoding;
61718 846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1634 char *stdout_encoding_str;
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1635 stdout_encoding = PyObject_GetAttrString(fout, "encoding");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1636 if (stdout_encoding == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1637 Py_DECREF(stdin_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1638 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1639 }
61718 846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1640 stdout_encoding_str = _PyUnicode_AsString(stdout_encoding);
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1641 if (stdout_encoding_str == NULL) {
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1642 Py_DECREF(stdin_encoding);
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1643 Py_DECREF(stdout_encoding);
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1644 return NULL;
846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1645 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1646 stringpo = PyObject_Str(promptarg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1647 if (stringpo == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1648 Py_DECREF(stdin_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1649 Py_DECREF(stdout_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1650 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1651 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1652 po = PyUnicode_AsEncodedString(stringpo,
61718 846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1653 stdout_encoding_str, NULL);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1654 Py_DECREF(stdout_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1655 Py_DECREF(stringpo);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1656 if (po == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1657 Py_DECREF(stdin_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1658 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1659 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1660 prompt = PyBytes_AsString(po);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1661 if (prompt == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1662 Py_DECREF(stdin_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1663 Py_DECREF(po);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1664 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1665 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1666 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1667 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1668 po = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1669 prompt = "";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1670 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1671 s = PyOS_Readline(stdin, stdout, prompt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1672 Py_XDECREF(po);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1673 if (s == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1674 if (!PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1675 PyErr_SetNone(PyExc_KeyboardInterrupt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1676 Py_DECREF(stdin_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1677 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1678 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1679 if (*s == '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1680 PyErr_SetNone(PyExc_EOFError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1681 result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1682 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1683 else { /* strip trailing '\n' */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1684 size_t len = strlen(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1685 if (len > PY_SSIZE_T_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1686 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1687 "input: input too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1688 result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1689 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1690 else {
61718 846866aa0eb6 Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61593 diff changeset	1691 result = PyUnicode_Decode(s, len-1, stdin_encoding_str, NULL);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1692 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1693 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1694 Py_DECREF(stdin_encoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1695 PyMem_FREE(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1696 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1697 }
41888 aa73206c9ce6 Make input9) behave properly with the new I/O library. Guido van Rossum <guido@python.org> parents: 41846 diff changeset	1698
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1699 /* Fallback if we're not interactive */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1700 if (promptarg != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1701 if (PyFile_WriteObject(promptarg, fout, Py_PRINT_RAW) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1702 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1703 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1704 tmp = PyObject_CallMethod(fout, "flush", "");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1705 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1706 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1707 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1708 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1709 return PyFile_GetLine(fin, -1);
40933 a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1710 }
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1711
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1712 PyDoc_STRVAR(input_doc,
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1713 "input([prompt]) -> string\n\
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1714 \n\
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1715 Read a string from standard input. The trailing newline is stripped.\n\
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1716 If the user hits EOF (Unix: Ctl-D, Windows: Ctl-Z+Return), raise EOFError.\n\
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1717 On Unix, GNU readline is used if enabled. The prompt string, if given,\n\
a2629be1b1d0 Add raw_input() back, named input(). Revive the old unittests too. Guido van Rossum <guido@python.org> parents: 40922 diff changeset	1718 is printed without a trailing newline before reading.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1719
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1720
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1721 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	1722 builtin_repr(PyObject self, PyObject v)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	1723 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1724 return PyObject_Repr(v);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	1725 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	1726
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1727 PyDoc_STRVAR(repr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1728 "repr(object) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1729 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1730 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	1731 For most object types, eval(repr(object)) == object.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1732
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1733
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1734 static PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37048 diff changeset	1735 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	1736 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1737 static PyObject *round_str = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1738 PyObject *ndigits = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1739 static char *kwlist[] = {"number", "ndigits", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1740 PyObject number, round;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1741
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1742 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O:round",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1743 kwlist, &number, &ndigits))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1744 return NULL;
42718 7fe2848fd41d Implement the round functionality for PEP 3141, and add tests for it. Alex Martelli <aleaxit@gmail.com> parents: 42713 diff changeset	1745
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1746 if (Py_TYPE(number)->tp_dict == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1747 if (PyType_Ready(Py_TYPE(number)) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1748 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1749 }
42760 e3e06b389406 Before calling _PyType_Lookup() the type needs to be initialized. Guido van Rossum <guido@python.org> parents: 42753 diff changeset	1750
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1751 if (round_str == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1752 round_str = PyUnicode_InternFromString("__round__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1753 if (round_str == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1754 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1755 }
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42718 diff changeset	1756
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1757 round = _PyType_Lookup(Py_TYPE(number), round_str);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1758 if (round == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1759 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1760 "type %.100s doesn't define __round__ method",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1761 Py_TYPE(number)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1762 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1763 }
42718 7fe2848fd41d Implement the round functionality for PEP 3141, and add tests for it. Alex Martelli <aleaxit@gmail.com> parents: 42713 diff changeset	1764
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1765 if (ndigits == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1766 return PyObject_CallFunction(round, "O", number);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1767 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1768 return PyObject_CallFunction(round, "OO", number, ndigits);
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1769 }
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1770
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1771 PyDoc_STRVAR(round_doc,
51145 9742e8a4dca1 Issue #4707: round(x, n) now returns an integer when x is an integer. Mark Dickinson <dickinsm@gmail.com> parents: 50755 diff changeset	1772 "round(number[, ndigits]) -> number\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1773 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1774 Round a number to a given precision in decimal digits (default 0 digits).\n\
48432 8f1346502234 Docstring typo Mark Dickinson <dickinsm@gmail.com> parents: 48401 diff changeset	1775 This returns an int when called with one argument, otherwise the\n\
48401 70a4ec412882 #3191: fix round() docs and docstring. Georg Brandl <georg@python.org> parents: 47611 diff changeset	1776 same type as the number. ndigits may be negative.");
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42718 diff changeset	1777
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1778
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1779 static PyObject *
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1780 builtin_sorted(PyObject self, PyObject args, PyObject *kwds)
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1781 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1782 PyObject newlist, v, seq, keyfunc=NULL, *newargs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1783 PyObject *callable;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1784 static char *kwlist[] = {"iterable", "key", "reverse", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1785 int reverse;
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1786
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1787 /* args 1-3 should match listsort in Objects/listobject.c */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1788 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|Oi:sorted",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1789 kwlist, &seq, &keyfunc, &reverse))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1790 return NULL;
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1791
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1792 newlist = PySequence_List(seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1793 if (newlist == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1794 return NULL;
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1795
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1796 callable = PyObject_GetAttrString(newlist, "sort");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1797 if (callable == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1798 Py_DECREF(newlist);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1799 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1800 }
35500 8fa83a9ebc6e Whitespace normalization. Georg Brandl <georg@python.org> parents: 35364 diff changeset	1801
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1802 newargs = PyTuple_GetSlice(args, 1, 4);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1803 if (newargs == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1804 Py_DECREF(newlist);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1805 Py_DECREF(callable);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1806 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1807 }
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1808
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1809 v = PyObject_Call(callable, newargs, kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1810 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1811 Py_DECREF(callable);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1812 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1813 Py_DECREF(newlist);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1814 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1815 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1816 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1817 return newlist;
31210 c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1818 }
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1819
c06b570adf12 Guido grants a Christmas wish: Raymond Hettinger <python@rcn.com> parents: 31122 diff changeset	1820 PyDoc_STRVAR(sorted_doc,
45061 b9ee31a26f38 Issue #1771: Remove cmp parameter from list.sort() and builtin.sorted(). Raymond Hettinger <python@rcn.com> parents: 45029 diff changeset	1821 "sorted(iterable, key=None, reverse=False) --> new sorted list");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1822
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1823 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1824 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	1825 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1826 PyObject *v = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1827 PyObject *d;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1828
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1829 if (!PyArg_UnpackTuple(args, "vars", 0, 1, &v))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1830 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1831 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1832 d = PyEval_GetLocals();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1833 if (d == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1834 if (!PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1835 PyErr_SetString(PyExc_SystemError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1836 "vars(): no locals!?");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1837 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1838 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1839 Py_INCREF(d);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1840 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1841 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1842 d = PyObject_GetAttrString(v, "__dict__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1843 if (d == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1844 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1845 "vars() argument must have __dict__ attribute");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1846 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1847 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1848 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1849 return d;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1850 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1851
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1852 PyDoc_STRVAR(vars_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1853 "vars([object]) -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1854 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1855 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	1856 With an argument, equivalent to object.__dict__.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1857
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	1858 static PyObject*
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	1859 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	1860 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1861 PyObject *seq;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1862 PyObject *result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1863 PyObject temp, item, *iter;
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	1864
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1865 if (!PyArg_UnpackTuple(args, "sum", 1, 2, &seq, &result))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1866 return NULL;
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	1867
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1868 iter = PyObject_GetIter(seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1869 if (iter == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1870 return NULL;
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	1871
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1872 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1873 result = PyLong_FromLong(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1874 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1875 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1876 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1877 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1878 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1879 /* reject string values for 'start' parameter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1880 if (PyUnicode_Check(result)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1881 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1882 "sum() can't sum strings [use ''.join(seq) instead]");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1883 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1884 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1885 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1886 if (PyByteArray_Check(result)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1887 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1888 "sum() can't sum bytes [use b''.join(seq) instead]");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1889 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1890 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1891 }
43577 ace45b361e87 Patch# 1258 by Christian Heimes: kill basestring. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1892
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1893 Py_INCREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1894 }
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	1895
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43577 diff changeset	1896 #ifndef SLOW_SUM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1897 /* Fast addition by keeping temporary sums in C instead of new Python objects.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1898 Assumes all inputs are the same type. If the assumption fails, default
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1899 to the more general routine.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1900 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1901 if (PyLong_CheckExact(result)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1902 int overflow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1903 long i_result = PyLong_AsLongAndOverflow(result, &overflow);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1904 /* If this already overflowed, don't even enter the loop. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1905 if (overflow == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1906 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1907 result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1908 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1909 while(result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1910 item = PyIter_Next(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1911 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1912 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1913 if (PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1914 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1915 return PyLong_FromLong(i_result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1916 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1917 if (PyLong_CheckExact(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1918 long b = PyLong_AsLongAndOverflow(item, &overflow);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1919 long x = i_result + b;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1920 if (overflow == 0 && ((x^i_result) >= 0 \|\| (x^b) >= 0)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1921 i_result = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1922 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1923 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1924 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1925 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1926 /* Either overflowed or is not an int. Restore real objects and process normally */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1927 result = PyLong_FromLong(i_result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1928 temp = PyNumber_Add(result, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1929 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1930 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1931 result = temp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1932 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1933 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1934 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1935 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1936 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1937 }
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43577 diff changeset	1938
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1939 if (PyFloat_CheckExact(result)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1940 double f_result = PyFloat_AS_DOUBLE(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1941 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1942 result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1943 while(result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1944 item = PyIter_Next(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1945 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1946 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1947 if (PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1948 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1949 return PyFloat_FromDouble(f_result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1950 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1951 if (PyFloat_CheckExact(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1952 PyFPE_START_PROTECT("add", Py_DECREF(item); Py_DECREF(iter); return 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1953 f_result += PyFloat_AS_DOUBLE(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1954 PyFPE_END_PROTECT(f_result)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1955 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1956 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1957 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1958 if (PyLong_CheckExact(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1959 long value;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1960 int overflow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1961 value = PyLong_AsLongAndOverflow(item, &overflow);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1962 if (!overflow) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1963 PyFPE_START_PROTECT("add", Py_DECREF(item); Py_DECREF(iter); return 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1964 f_result += (double)value;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1965 PyFPE_END_PROTECT(f_result)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1966 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1967 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1968 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1969 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1970 result = PyFloat_FromDouble(f_result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1971 temp = PyNumber_Add(result, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1972 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1973 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1974 result = temp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1975 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1976 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1977 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1978 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1979 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1980 }
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43577 diff changeset	1981 #endif
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43577 diff changeset	1982
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1983 for(;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1984 item = PyIter_Next(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1985 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1986 /* error, or end-of-sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1987 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1988 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1989 result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1990 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1991 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1992 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1993 /* It's tempting to use PyNumber_InPlaceAdd instead of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1994 PyNumber_Add here, to avoid quadratic running time
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1995 when doing 'sum(list_of_lists, [])'. However, this
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1996 would produce a change in behaviour: a snippet like
56751 7dc57b991d83 Merged revisions 75714 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	1997
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1998 empty = []
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	1999 sum([[x] for x in range(10)], empty)
56751 7dc57b991d83 Merged revisions 75714 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56594 diff changeset	2000
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2001 would change the value of empty. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2002 temp = PyNumber_Add(result, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2003 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2004 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2005 result = temp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2006 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2007 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2008 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2009 Py_DECREF(iter);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2010 return result;
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2011 }
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2012
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2013 PyDoc_STRVAR(sum_doc,
47097 b2403d470b69 Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings. Georg Brandl <georg@python.org> parents: 47080 diff changeset	2014 "sum(iterable[, start]) -> value\n\
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2015 \n\
47097 b2403d470b69 Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings. Georg Brandl <georg@python.org> parents: 47080 diff changeset	2016 Returns the sum of an iterable of numbers (NOT strings) plus the value\n\
b2403d470b69 Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings. Georg Brandl <georg@python.org> parents: 47080 diff changeset	2017 of parameter 'start' (which defaults to 0). When the iterable is\n\
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40411 diff changeset	2018 empty, returns start.");
28717 13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2019
13d0a3c4e465 Adding new built-in function sum, with docs and tests. Alex Martelli <aleaxit@gmail.com> parents: 28612 diff changeset	2020
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2021 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2022 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	2023 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2024 PyObject *inst;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2025 PyObject *cls;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2026 int retval;
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2027
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2028 if (!PyArg_UnpackTuple(args, "isinstance", 2, 2, &inst, &cls))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2029 return NULL;
10995 0d186c10a70e Patch by Jim Fulton (code style tweaked a bit) to support Guido van Rossum <guido@python.org> parents: 10529 diff changeset	2030
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2031 retval = PyObject_IsInstance(inst, cls);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2032 if (retval < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2033 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2034 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	2035 }
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2036
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2037 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	2038 "isinstance(object, class-or-type-or-tuple) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2039 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2040 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	2041 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	2042 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	2043 isinstance(x, A) or isinstance(x, B) or ... (etc.).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2044
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2045
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2046 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2047 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	2048 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2049 PyObject *derived;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2050 PyObject *cls;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2051 int retval;
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2052
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2053 if (!PyArg_UnpackTuple(args, "issubclass", 2, 2, &derived, &cls))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2054 return NULL;
10995 0d186c10a70e Patch by Jim Fulton (code style tweaked a bit) to support Guido van Rossum <guido@python.org> parents: 10529 diff changeset	2055
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2056 retval = PyObject_IsSubclass(derived, cls);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2057 if (retval < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2058 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2059 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	2060 }
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2061
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2062 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	2063 "issubclass(C, B) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2064 \n\
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25924 diff changeset	2065 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	2066 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	2067 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	2068
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	2069
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2070 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2071 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2072 Py_ssize_t tuplesize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2073 PyObject ittuple; / tuple of iterators */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2074 PyObject *result;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2075 } zipobject;
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2076
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2077 static PyObject *
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2078 zip_new(PyTypeObject type, PyObject args, PyObject *kwds)
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2079 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2080 zipobject *lz;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2081 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2082 PyObject ittuple; / tuple of iterators */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2083 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2084 Py_ssize_t tuplesize = PySequence_Length(args);
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2085
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2086 if (type == &PyZip_Type && !_PyArg_NoKeywords("zip()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2087 return NULL;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2088
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2089 /* args must be a tuple */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2090 assert(PyTuple_Check(args));
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2091
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2092 /* obtain iterators */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2093 ittuple = PyTuple_New(tuplesize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2094 if (ittuple == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2095 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2096 for (i=0; i < tuplesize; ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2097 PyObject *item = PyTuple_GET_ITEM(args, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2098 PyObject *it = PyObject_GetIter(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2099 if (it == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2100 if (PyErr_ExceptionMatches(PyExc_TypeError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2101 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2102 "zip argument #%zd must support iteration",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2103 i+1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2104 Py_DECREF(ittuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2105 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2106 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2107 PyTuple_SET_ITEM(ittuple, i, it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2108 }
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2109
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2110 /* create a result holder */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2111 result = PyTuple_New(tuplesize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2112 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2113 Py_DECREF(ittuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2114 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2115 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2116 for (i=0 ; i < tuplesize ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2117 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2118 PyTuple_SET_ITEM(result, i, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2119 }
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2120
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2121 /* create zipobject structure */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2122 lz = (zipobject *)type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2123 if (lz == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2124 Py_DECREF(ittuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2125 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2126 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2127 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2128 lz->ittuple = ittuple;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2129 lz->tuplesize = tuplesize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2130 lz->result = result;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2131
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2132 return (PyObject *)lz;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2133 }
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2134
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2135 static void
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2136 zip_dealloc(zipobject *lz)
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2137 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2138 PyObject_GC_UnTrack(lz);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2139 Py_XDECREF(lz->ittuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2140 Py_XDECREF(lz->result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2141 Py_TYPE(lz)->tp_free(lz);
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2142 }
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2143
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2144 static int
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2145 zip_traverse(zipobject lz, visitproc visit, void arg)
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2146 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2147 Py_VISIT(lz->ittuple);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2148 Py_VISIT(lz->result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2149 return 0;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2150 }
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2151
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2152 static PyObject *
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2153 zip_next(zipobject *lz)
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2154 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2155 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2156 Py_ssize_t tuplesize = lz->tuplesize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2157 PyObject *result = lz->result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2158 PyObject *it;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2159 PyObject *item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2160 PyObject *olditem;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2161
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2162 if (tuplesize == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2163 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2164 if (Py_REFCNT(result) == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2165 Py_INCREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2166 for (i=0 ; i < tuplesize ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2167 it = PyTuple_GET_ITEM(lz->ittuple, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2168 item = (*Py_TYPE(it)->tp_iternext)(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2169 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2170 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2171 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2172 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2173 olditem = PyTuple_GET_ITEM(result, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2174 PyTuple_SET_ITEM(result, i, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2175 Py_DECREF(olditem);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2176 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2177 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2178 result = PyTuple_New(tuplesize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2179 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2180 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2181 for (i=0 ; i < tuplesize ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2182 it = PyTuple_GET_ITEM(lz->ittuple, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2183 item = (*Py_TYPE(it)->tp_iternext)(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2184 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2185 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2186 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2187 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2188 PyTuple_SET_ITEM(result, i, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2189 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2190 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2191 return result;
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2192 }
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2193
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2194 PyDoc_STRVAR(zip_doc,
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2195 "zip(iter1 [,iter2 [...]]) --> zip object\n\
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2196 \n\
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2197 Return a zip object whose .__next__() method returns a tuple where\n\
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2198 the i-th element comes from the i-th iterable argument. The .__next__()\n\
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2199 method continues until the shortest iterable in the argument sequence\n\
50076 c7abfab4dcdb Merged revisions 67525-67527,67529,67548-67549,67551-67552,67555,67578,67586,67593-67594,67596,67605-67606,67609,67612,67616-67617,67632,67635,67638 via svnmerge from Georg Brandl <georg@python.org> parents: 49613 diff changeset	2200 is exhausted and then it raises StopIteration.");
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2201
740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2202 PyTypeObject PyZip_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2203 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2204 "zip", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2205 sizeof(zipobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2206 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2207 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2208 (destructor)zip_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2209 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2210 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2211 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2212 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2213 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2214 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2215 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2216 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2217 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2218 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2219 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2220 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2221 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2222 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2223 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2224 Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2225 zip_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2226 (traverseproc)zip_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2227 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2228 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2229 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2230 PyObject_SelfIter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2231 (iternextfunc)zip_next, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2232 0, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2233 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2234 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2235 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2236 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2237 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2238 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2239 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2240 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2241 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2242 zip_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2243 PyObject_GC_Del, /* tp_free */
45738 740b5808c57a Move itertools izip() code to builtins as zip(). Complete the renaming. Raymond Hettinger <python@rcn.com> parents: 45735 diff changeset	2244 };
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2245
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	2246
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2247 static PyMethodDef builtin_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2248 {"__build_class__", (PyCFunction)builtin___build_class__,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2249 METH_VARARGS \| METH_KEYWORDS, build_class_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2250 {"__import__", (PyCFunction)builtin___import__, METH_VARARGS \| METH_KEYWORDS, import_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2251 {"abs", builtin_abs, METH_O, abs_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2252 {"all", builtin_all, METH_O, all_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2253 {"any", builtin_any, METH_O, any_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2254 {"ascii", builtin_ascii, METH_O, ascii_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2255 {"bin", builtin_bin, METH_O, bin_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2256 {"chr", builtin_chr, METH_VARARGS, chr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2257 {"compile", (PyCFunction)builtin_compile, METH_VARARGS \| METH_KEYWORDS, compile_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2258 {"delattr", builtin_delattr, METH_VARARGS, delattr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2259 {"dir", builtin_dir, METH_VARARGS, dir_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2260 {"divmod", builtin_divmod, METH_VARARGS, divmod_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2261 {"eval", builtin_eval, METH_VARARGS, eval_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2262 {"exec", builtin_exec, METH_VARARGS, exec_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2263 {"format", builtin_format, METH_VARARGS, format_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2264 {"getattr", builtin_getattr, METH_VARARGS, getattr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2265 {"globals", (PyCFunction)builtin_globals, METH_NOARGS, globals_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2266 {"hasattr", builtin_hasattr, METH_VARARGS, hasattr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2267 {"hash", builtin_hash, METH_O, hash_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2268 {"hex", builtin_hex, METH_O, hex_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2269 {"id", builtin_id, METH_O, id_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2270 {"input", builtin_input, METH_VARARGS, input_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2271 {"isinstance", builtin_isinstance, METH_VARARGS, isinstance_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2272 {"issubclass", builtin_issubclass, METH_VARARGS, issubclass_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2273 {"iter", builtin_iter, METH_VARARGS, iter_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2274 {"len", builtin_len, METH_O, len_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2275 {"locals", (PyCFunction)builtin_locals, METH_NOARGS, locals_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2276 {"max", (PyCFunction)builtin_max, METH_VARARGS \| METH_KEYWORDS, max_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2277 {"min", (PyCFunction)builtin_min, METH_VARARGS \| METH_KEYWORDS, min_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2278 {"next", (PyCFunction)builtin_next, METH_VARARGS, next_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2279 {"oct", builtin_oct, METH_O, oct_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2280 {"ord", builtin_ord, METH_O, ord_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2281 {"pow", builtin_pow, METH_VARARGS, pow_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2282 {"print", (PyCFunction)builtin_print, METH_VARARGS \| METH_KEYWORDS, print_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2283 {"repr", builtin_repr, METH_O, repr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2284 {"round", (PyCFunction)builtin_round, METH_VARARGS \| METH_KEYWORDS, round_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2285 {"setattr", builtin_setattr, METH_VARARGS, setattr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2286 {"sorted", (PyCFunction)builtin_sorted, METH_VARARGS \| METH_KEYWORDS, sorted_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2287 {"sum", builtin_sum, METH_VARARGS, sum_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2288 {"vars", builtin_vars, METH_VARARGS, vars_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2289 {NULL, NULL},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2290 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2291
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2292 PyDoc_STRVAR(builtin_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2293 "Built-in functions, exceptions, and other objects.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	2294 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	2295 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	2296
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47557 diff changeset	2297 static struct PyModuleDef builtinsmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2298 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2299 "builtins",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2300 builtin_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2301 -1, /* multiple "initialization" just copies the module dict. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2302 builtin_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2303 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2304 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2305 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2306 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47557 diff changeset	2307 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47557 diff changeset	2308
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47557 diff changeset	2309
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	2310 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2311 _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	2312 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2313 PyObject mod, dict, *debug;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2314 mod = PyModule_Create(&builtinsmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2315 if (mod == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2316 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2317 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	2318
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2319 #ifdef Py_TRACE_REFS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2320 /* "builtins" exposes a number of statically allocated objects
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2321 * that, before this code was added in 2.3, never showed up in
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2322 * the list of "all objects" maintained by Py_TRACE_REFS. As a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2323 * result, programs leaking references to None and False (etc)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2324 * couldn't be diagnosed by examining sys.getobjects(0).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2325 */
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2326 #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	2327 #else
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2328 #define ADD_TO_ALL(OBJECT) (void)0
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2329 #endif
d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2330
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	2331 #define SETBUILTIN(NAME, OBJECT) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2332 if (PyDict_SetItemString(dict, NAME, (PyObject *)OBJECT) < 0) \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2333 return NULL; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2334 ADD_TO_ALL(OBJECT)
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	2335
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2336 SETBUILTIN("None", Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2337 SETBUILTIN("Ellipsis", Py_Ellipsis);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2338 SETBUILTIN("NotImplemented", Py_NotImplemented);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2339 SETBUILTIN("False", Py_False);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2340 SETBUILTIN("True", Py_True);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2341 SETBUILTIN("bool", &PyBool_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2342 SETBUILTIN("memoryview", &PyMemoryView_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2343 SETBUILTIN("bytearray", &PyByteArray_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2344 SETBUILTIN("bytes", &PyBytes_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2345 SETBUILTIN("classmethod", &PyClassMethod_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2346 SETBUILTIN("complex", &PyComplex_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2347 SETBUILTIN("dict", &PyDict_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2348 SETBUILTIN("enumerate", &PyEnum_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2349 SETBUILTIN("filter", &PyFilter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2350 SETBUILTIN("float", &PyFloat_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2351 SETBUILTIN("frozenset", &PyFrozenSet_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2352 SETBUILTIN("property", &PyProperty_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2353 SETBUILTIN("int", &PyLong_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2354 SETBUILTIN("list", &PyList_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2355 SETBUILTIN("map", &PyMap_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2356 SETBUILTIN("object", &PyBaseObject_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2357 SETBUILTIN("range", &PyRange_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2358 SETBUILTIN("reversed", &PyReversed_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2359 SETBUILTIN("set", &PySet_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2360 SETBUILTIN("slice", &PySlice_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2361 SETBUILTIN("staticmethod", &PyStaticMethod_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2362 SETBUILTIN("str", &PyUnicode_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2363 SETBUILTIN("super", &PySuper_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2364 SETBUILTIN("tuple", &PyTuple_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2365 SETBUILTIN("type", &PyType_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2366 SETBUILTIN("zip", &PyZip_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2367 debug = PyBool_FromLong(Py_OptimizeFlag == 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2368 if (PyDict_SetItemString(dict, "__debug__", debug) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2369 Py_XDECREF(debug);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2370 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2371 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2372 Py_XDECREF(debug);
6198 c43ca8dd0081 Removed obsolete exception PyExc_AccessError. Barry Warsaw <barry@python.org> parents: 6145 diff changeset	2373
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59994 diff changeset	2374 return mod;
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28027 diff changeset	2375 #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	2376 #undef SETBUILTIN
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2377 }

Mercurial > cpython-lru_cache-weakref

annotate Python/bltinmodule.c @ 64223:7ff3fa429721