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

annotate Python/bltinmodule.c @ 28325:850626d47574 legacy-trunk

Fixed SF bug #663074. The codec system was using global static variables to store internal data. As a result, any atempts to use the unicode system with multiple active interpreters, or successive interpreter executions, would fail. Now that information is stored into members of the PyInterpreterState structure.

author	Gustavo Niemeyer <gustavo@niemeyer.net>
date	Wed, 19 Mar 2003 00:35:36 +0000
parents	43a9ecbd9607
children	d56282c28a1e

rev	line source
15637 7fb7c51a2e61 Whoops! Two stray characters crept in to my last check-in Andrew M. Kuchling <amk@amk.ca> parents: 15635 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Built-in functions */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	3
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4 #include "Python.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"
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	7 #include "compile.h"
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
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	12 #ifdef RISCOS
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	13 #include "unixstuff.h"
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	14 #endif
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 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
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	18 */
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23868 diff changeset	19 #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	20 const char *Py_FileSystemDefaultEncoding = "mbcs";
27782 904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	21 #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	22 const char *Py_FileSystemDefaultEncoding = "utf-8";
17822 50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	23 #else
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	24 const char Py_FileSystemDefaultEncoding = NULL; / use default */
50376d470648 Fix the Py_FileSystemDefaultEncoding checkin - declare the variable in a fileobject.h, and initialize it in bltinmodule. Mark Hammond <mhammond@skippinet.com.au> parents: 17817 diff changeset	25 #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	26
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	27 /* Forward */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13446 diff changeset	28 static PyObject filterstring(PyObject , PyObject *);
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	29 #ifdef Py_USING_UNICODE
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	30 static PyObject filterunicode(PyObject , PyObject *);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	31 #endif
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13446 diff changeset	32 static PyObject filtertuple (PyObject , PyObject *);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	33
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	34 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	35 builtin___import__(PyObject self, PyObject args)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	36 {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	37 char *name;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	38 PyObject *globals = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	39 PyObject *locals = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	40 PyObject *fromlist = NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	41
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	42 if (!PyArg_ParseTuple(args, "s\|OOO:__import__",
2338 4c2f1452125d call __import__() with 4 args instead of 1 Guido van Rossum <guido@python.org> parents: 2306 diff changeset	43 &name, &globals, &locals, &fromlist))
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	44 return NULL;
6243 4279f4eb210a First part of package support. Guido van Rossum <guido@python.org> parents: 6198 diff changeset	45 return PyImport_ImportModuleEx(name, globals, locals, fromlist);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	46 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	47
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	48 PyDoc_STRVAR(import_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	49 "__import__(name, globals, locals, fromlist) -> module\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	50 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	51 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	52 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	53 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	54 empty list to emulate ``import name''.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	55 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	56 returns package A when fromlist is empty, but its submodule B when\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	57 fromlist is not empty.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	58
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	59
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	60 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	61 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	62 {
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	63 return PyNumber_Absolute(v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	64 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	65
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	66 PyDoc_STRVAR(abs_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	67 "abs(number) -> number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	68 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	69 Return the absolute value of the argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	70
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	71
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	72 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	73 builtin_apply(PyObject self, PyObject args)
480 c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	74 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	75 PyObject func, alist = NULL, *kwdict = NULL;
9188 a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	76 PyObject t = NULL, retval = NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	77
28027 43a9ecbd9607 Fix SF bug #690435, apply fails to check if warning raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 27878 diff changeset	78 if (PyErr_Warn(PyExc_PendingDeprecationWarning,
43a9ecbd9607 Fix SF bug #690435, apply fails to check if warning raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 27878 diff changeset	79 "use func(args, *kwargs) instead of "
43a9ecbd9607 Fix SF bug #690435, apply fails to check if warning raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 27878 diff changeset	80 "apply(func, args, kwargs)") < 0)
43a9ecbd9607 Fix SF bug #690435, apply fails to check if warning raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 27878 diff changeset	81 return NULL;
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	82 if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict))
480 c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	83 return NULL;
9188 a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	84 if (alist != NULL) {
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	85 if (!PyTuple_Check(alist)) {
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	86 if (!PySequence_Check(alist)) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16011 diff changeset	87 PyErr_Format(PyExc_TypeError,
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16011 diff changeset	88 "apply() arg 2 expect sequence, found %s",
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16011 diff changeset	89 alist->ob_type->tp_name);
9188 a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	90 return NULL;
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	91 }
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	92 t = PySequence_Tuple(alist);
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	93 if (t == NULL)
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	94 return NULL;
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	95 alist = t;
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	96 }
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	97 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	98 if (kwdict != NULL && !PyDict_Check(kwdict)) {
16017 7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16011 diff changeset	99 PyErr_Format(PyExc_TypeError,
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16011 diff changeset	100 "apply() arg 3 expected dictionary, found %s",
7234d7c3c29f clearer error messages for apply() and "no locals" Jeremy Hylton <jeremy@alum.mit.edu> parents: 16011 diff changeset	101 kwdict->ob_type->tp_name);
9188 a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	102 goto finally;
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2824 diff changeset	103 }
9188 a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	104 retval = PyEval_CallObjectWithKeywords(func, alist, kwdict);
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	105 finally:
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	106 Py_XDECREF(t);
a1672e775f33 builtin_apply(): Second argument type check is relaxed to allow any sequence. Barry Warsaw <barry@python.org> parents: 9112 diff changeset	107 return retval;
480 c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	108 }
c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	109
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	110 PyDoc_STRVAR(apply_doc,
15832 0ae389e935fc Update the docstring for apply() so that "args" is marked as optional Fred Drake <fdrake@acm.org> parents: 15829 diff changeset	111 "apply(object[, args[, kwargs]]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	112 \n\
11621 0ec803cbd872 Adjusted apply() docstring based on comments from Gerrit Holl Fred Drake <fdrake@acm.org> parents: 11383 diff changeset	113 Call a callable object with positional arguments taken from the tuple args,\n\
0ec803cbd872 Adjusted apply() docstring based on comments from Gerrit Holl Fred Drake <fdrake@acm.org> parents: 11383 diff changeset	114 and keyword arguments taken from the optional dictionary kwargs.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	115 Note that classes are callable, as are instances with a __call__() method.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	116
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	117
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	118 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	119 builtin_callable(PyObject self, PyObject v)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	120 {
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	121 return PyBool_FromLong((long)PyCallable_Check(v));
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	122 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	123
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	124 PyDoc_STRVAR(callable_doc,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22205 diff changeset	125 "callable(object) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	126 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	127 Return whether the object is callable (i.e., some kind of function).\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	128 Note that classes are callable, as are instances with a __call__() method.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	129
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	130
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	131 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	132 builtin_filter(PyObject self, PyObject args)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	133 {
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	134 PyObject func, seq, result, it, *arg;
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	135 int len; /* guess for result list size */
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	136 register int j;
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	137
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	138 if (!PyArg_UnpackTuple(args, "filter", 2, 2, &func, &seq))
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	139 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	140
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	141 /* Strings and tuples return a result of the same type. */
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	142 if (PyString_Check(seq))
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	143 return filterstring(func, seq);
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	144 #ifdef Py_USING_UNICODE
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	145 if (PyUnicode_Check(seq))
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	146 return filterunicode(func, seq);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	147 #endif
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	148 if (PyTuple_Check(seq))
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	149 return filtertuple(func, seq);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	150
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	151 /* Get iterator. */
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	152 it = PyObject_GetIter(seq);
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	153 if (it == NULL)
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	154 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	155
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	156 /* Guess a result list size. */
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	157 len = -1; /* unknown */
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	158 if (PySequence_Check(seq) &&
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	159 seq->ob_type->tp_as_sequence->sq_length) {
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	160 len = PySequence_Size(seq);
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	161 if (len < 0)
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	162 PyErr_Clear();
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	163 }
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	164 if (len < 0)
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	165 len = 8; /* arbitrary */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	166
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	167 /* Pre-allocate argument list tuple. */
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	168 arg = PyTuple_New(1);
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	169 if (arg == NULL)
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	170 goto Fail_arg;
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	171
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	172 /* Get a result list. */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	173 if (PyList_Check(seq) && seq->ob_refcnt == 1) {
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	174 /* Eww - can modify the list in-place. */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	175 Py_INCREF(seq);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	176 result = seq;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	177 }
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	178 else {
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	179 result = PyList_New(len);
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	180 if (result == NULL)
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	181 goto Fail_it;
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	182 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	183
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	184 /* Build the result list. */
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	185 j = 0;
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	186 for (;;) {
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	187 PyObject *item;
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	188 int ok;
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	189
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	190 item = PyIter_Next(it);
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	191 if (item == NULL) {
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	192 if (PyErr_Occurred())
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	193 goto Fail_result_it;
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	194 break;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	195 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	196
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	197 if (func == Py_None) {
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	198 ok = PyObject_IsTrue(item);
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	199 }
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	200 else {
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	201 PyObject *good;
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	202 PyTuple_SET_ITEM(arg, 0, item);
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	203 good = PyObject_Call(func, arg, NULL);
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	204 PyTuple_SET_ITEM(arg, 0, NULL);
2120 84b61fe44573 fix subtle refcount big in filter() -- Tim MacKenzie Guido van Rossum <guido@python.org> parents: 2113 diff changeset	205 if (good == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	206 Py_DECREF(item);
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	207 goto Fail_result_it;
2120 84b61fe44573 fix subtle refcount big in filter() -- Tim MacKenzie Guido van Rossum <guido@python.org> parents: 2113 diff changeset	208 }
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	209 ok = PyObject_IsTrue(good);
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	210 Py_DECREF(good);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	211 }
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	212 if (ok) {
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	213 if (j < len)
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	214 PyList_SET_ITEM(result, j, item);
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	215 else {
9991 ddbbed8cb830 builtin_map(): A better fix for the previous leak plug (remember Barry Warsaw <barry@python.org> parents: 9980 diff changeset	216 int status = PyList_Append(result, item);
ddbbed8cb830 builtin_map(): A better fix for the previous leak plug (remember Barry Warsaw <barry@python.org> parents: 9980 diff changeset	217 Py_DECREF(item);
ddbbed8cb830 builtin_map(): A better fix for the previous leak plug (remember Barry Warsaw <barry@python.org> parents: 9980 diff changeset	218 if (status < 0)
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	219 goto Fail_result_it;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	220 }
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	221 ++j;
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	222 }
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	223 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	224 Py_DECREF(item);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	225 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	226
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	227
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	228 /* Cut back result list if len is too big. */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	229 if (j < len && PyList_SetSlice(result, j, len, NULL) < 0)
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	230 goto Fail_result_it;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	231
17874 eb03c6fc31e5 SF bug #425836: Reference leak in filter(). Tim Peters <tim.peters@gmail.com> parents: 17822 diff changeset	232 Py_DECREF(it);
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	233 Py_DECREF(arg);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	234 return result;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	235
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	236 Fail_result_it:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	237 Py_DECREF(result);
17654 a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	238 Fail_it:
a97e18e499a9 Generalize filter(f, seq) to work with iterators. This also generalizes Tim Peters <tim.peters@gmail.com> parents: 17641 diff changeset	239 Py_DECREF(it);
24863 a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	240 Fail_arg:
a3ebd1233c00 A nice little speed-up for filter(): Guido van Rossum <guido@python.org> parents: 24817 diff changeset	241 Py_DECREF(arg);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	242 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	243 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	244
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	245 PyDoc_STRVAR(filter_doc,
22225 67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	246 "filter(function or None, sequence) -> list, tuple, or string\n"
67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	247 "\n"
67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	248 "Return those items of sequence for which function(item) is true. If\n"
67a5e25dc88b backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21712 diff changeset	249 "function is None, return the items that are true. If sequence is a tuple\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	250 "or string, return the same type, else return a list.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	251
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	252 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	253 builtin_chr(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	254 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	255 long x;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	256 char s[1];
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	257
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	258 if (!PyArg_ParseTuple(args, "l:chr", &x))
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	259 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	260 if (x < 0 \|\| x >= 256) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	261 PyErr_SetString(PyExc_ValueError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	262 "chr() arg not in range(256)");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	263 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	264 }
5317 c72c7e1930b3 Keep gcc -Wall and Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5223 diff changeset	265 s[0] = (char)x;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	266 return PyString_FromStringAndSize(s, 1);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	267 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	268
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	269 PyDoc_STRVAR(chr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	270 "chr(i) -> character\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	271 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	272 Return a string of one character with ordinal i; 0 <= i < 256.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	273
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	274
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	275 #ifdef Py_USING_UNICODE
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	276 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	277 builtin_unichr(PyObject self, PyObject args)
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	278 {
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	279 long x;
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	280
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	281 if (!PyArg_ParseTuple(args, "l:unichr", &x))
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	282 return NULL;
18282 f38923ce3c6b more unicode tweaks: make unichr(0xdddddddd) behave like u"\Udddddddd" Fredrik Lundh <fredrik@pythonware.com> parents: 18281 diff changeset	283
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24071 diff changeset	284 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	285 }
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	286
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	287 PyDoc_STRVAR(unichr_doc,
12386 32e9d0e78935 When refering to Unicode characters in exception messages and Fred Drake <fdrake@acm.org> parents: 12384 diff changeset	288 "unichr(i) -> Unicode character\n\
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	289 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	290 Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff.");
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	291 #endif
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	292
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	293
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	294 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	295 builtin_cmp(PyObject self, PyObject args)
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	296 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	297 PyObject a, b;
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	298 int c;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	299
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	300 if (!PyArg_UnpackTuple(args, "cmp", 2, 2, &a, &b))
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	301 return NULL;
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	302 if (PyObject_Cmp(a, b, &c) < 0)
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5471 diff changeset	303 return NULL;
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	304 return PyInt_FromLong((long)c);
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	305 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	306
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	307 PyDoc_STRVAR(cmp_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	308 "cmp(x, y) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	309 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	310 Return negative if x<y, zero if x==y, positive if x>y.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	311
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	312
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	313 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	314 builtin_coerce(PyObject self, PyObject args)
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2106 diff changeset	315 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	316 PyObject v, w;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	317 PyObject *res;
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2106 diff changeset	318
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	319 if (!PyArg_UnpackTuple(args, "coerce", 2, 2, &v, &w))
2113 76c860a18d82 move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently Guido van Rossum <guido@python.org> parents: 2106 diff changeset	320 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	321 if (PyNumber_Coerce(&v, &w) < 0)
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	322 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	323 res = Py_BuildValue("(OO)", v, w);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	324 Py_DECREF(v);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	325 Py_DECREF(w);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	326 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	327 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 926 diff changeset	328
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	329 PyDoc_STRVAR(coerce_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	330 "coerce(x, y) -> None or (x1, y1)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	331 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	332 When x and y can be coerced to values of the same type, return a tuple\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	333 containing the coerced values. When they can't be coerced, return None.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	334
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	335
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	336 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	337 builtin_compile(PyObject self, PyObject args)
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	338 {
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	339 char *str;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	340 char *filename;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	341 char *startstr;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	342 int start;
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	343 int dont_inherit = 0;
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	344 int supplied_flags = 0;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18436 diff changeset	345 PyCompilerFlags cf;
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	346 PyObject result, cmd, *tmp = NULL;
27782 904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	347 int length;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	348
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	349 if (!PyArg_ParseTuple(args, "Oss\|ii:compile", &cmd, &filename,
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	350 &startstr, &supplied_flags, &dont_inherit))
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	351 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	352
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	353 cf.cf_flags = supplied_flags;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	354
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	355 #ifdef Py_USING_UNICODE
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	356 if (PyUnicode_Check(cmd)) {
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	357 tmp = PyUnicode_AsUTF8String(cmd);
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	358 if (tmp == NULL)
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	359 return NULL;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	360 cmd = tmp;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	361 cf.cf_flags \|= PyCF_SOURCE_IS_UTF8;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	362 }
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	363 #endif
27782 904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	364 if (PyObject_AsReadBuffer(cmd, (const void **)&str, &length))
904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	365 return NULL;
27790 b650a54a76fd Squashed compiler wng about signed/unsigned clash in comparison. Tim Peters <tim.peters@gmail.com> parents: 27786 diff changeset	366 if ((size_t)length != strlen(str)) {
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	367 PyErr_SetString(PyExc_TypeError,
27782 904f0e769820 My previous checkin caused compile() to no longer accept buffers, as noted Just van Rossum <just@letterror.com> parents: 27781 diff changeset	368 "expected string without null bytes");
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	369 return NULL;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	370 }
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	371
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	372 if (strcmp(startstr, "exec") == 0)
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5421 diff changeset	373 start = Py_file_input;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	374 else if (strcmp(startstr, "eval") == 0)
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5421 diff changeset	375 start = Py_eval_input;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	376 else if (strcmp(startstr, "single") == 0)
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5421 diff changeset	377 start = Py_single_input;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	378 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	379 PyErr_SetString(PyExc_ValueError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	380 "compile() arg 3 must be 'exec' or 'eval' or 'single'");
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	381 return NULL;
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	382 }
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	383
27878 be7683a6f521 - Finally fixed the bug in compile() and exec where a string ending Guido van Rossum <guido@python.org> parents: 27795 diff changeset	384 if (supplied_flags &
be7683a6f521 - Finally fixed the bug in compile() and exec where a string ending Guido van Rossum <guido@python.org> parents: 27795 diff changeset	385 ~(PyCF_MASK \| PyCF_MASK_OBSOLETE \| PyCF_DONT_IMPLY_DEDENT))
be7683a6f521 - Finally fixed the bug in compile() and exec where a string ending Guido van Rossum <guido@python.org> parents: 27795 diff changeset	386 {
19355 d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	387 PyErr_SetString(PyExc_ValueError,
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	388 "compile(): unrecognised flags");
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	389 return NULL;
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	390 }
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	391 /* XXX Warn if (supplied_flags & PyCF_MASK_OBSOLETE) != 0? */
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	392
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	393 if (!dont_inherit) {
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	394 PyEval_MergeCompilerFlags(&cf);
d5acff178ad5 A fiddled version of the rest of Michael Hudson's SF patch Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	395 }
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	396 result = Py_CompileStringFlags(str, filename, start, &cf);
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	397 Py_XDECREF(tmp);
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	398 return result;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	399 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	400
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	401 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	402 "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	403 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	404 Compile the source string (a Python module, statement or expression)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	405 into a code object that can be executed by the exec statement or eval().\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	406 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	407 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	408 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	409 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	410 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	411 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	412 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	413 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	414 in addition to any features explicitly specified.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	415
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	416 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	417 builtin_dir(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	418 {
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	419 PyObject *arg = NULL;
08c3c9edd99b Make dir() wordier (see the new docstring). The new behavior is a mixed Tim Peters <tim.peters@gmail.com> parents: 19471 diff changeset	420
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	421 if (!PyArg_UnpackTuple(args, "dir", 0, 1, &arg))
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	422 return NULL;
19705 b7f6fbc087a7 At Guido's suggestion, here's a new C API function, PyObject_Dir(), like Tim Peters <tim.peters@gmail.com> parents: 19670 diff changeset	423 return PyObject_Dir(arg);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	424 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	425
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	426 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	427 "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	428 "\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	429 "Return an alphabetized list of names comprising (some of) the attributes\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	430 "of the given object, and of attributes reachable from it:\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	431 "\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	432 "No argument: the names in the current scope.\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	433 "Module object: the module attributes.\n"
19670 78cfb993f274 builtin_dir(): Treat classic classes like types. Use PyDict_Keys instead Tim Peters <tim.peters@gmail.com> parents: 19665 diff changeset	434 "Type or class object: its attributes, and recursively the attributes of\n"
78cfb993f274 builtin_dir(): Treat classic classes like types. Use PyDict_Keys instead Tim Peters <tim.peters@gmail.com> parents: 19665 diff changeset	435 " its bases.\n"
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	436 "Otherwise: its attributes, its class's attributes, and recursively the\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	437 " attributes of its class's base classes.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	438
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	439 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	440 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	441 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	442 PyObject v, w;
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	443
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	444 if (!PyArg_UnpackTuple(args, "divmod", 2, 2, &v, &w))
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	445 return NULL;
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	446 return PyNumber_Divmod(v, w);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	447 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	448
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	449 PyDoc_STRVAR(divmod_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	450 "divmod(x, y) -> (div, mod)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	451 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	452 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	453
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	454
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	455 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	456 builtin_eval(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	457 {
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	458 PyObject cmd, result, *tmp = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	459 PyObject globals = Py_None, locals = Py_None;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	460 char *str;
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	461 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	462
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	463 if (!PyArg_ParseTuple(args, "O\|O!O!:eval",
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	464 &cmd,
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	465 &PyDict_Type, &globals,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	466 &PyDict_Type, &locals))
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	467 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	468 if (globals == Py_None) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	469 globals = PyEval_GetGlobals();
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	470 if (locals == Py_None)
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	471 locals = PyEval_GetLocals();
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	472 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	473 else if (locals == Py_None)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	474 locals = globals;
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	475
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	476 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	477 if (PyDict_SetItemString(globals, "__builtins__",
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	478 PyEval_GetBuiltins()) != 0)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	479 return NULL;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	480 }
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	481
18885 22456d0ee737 Fix for SF bug [ #443866 ] Evaluating func_code causing core dump Jeremy Hylton <jeremy@alum.mit.edu> parents: 18836 diff changeset	482 if (PyCode_Check(cmd)) {
21398 de125792bfaa Fix for SF bug [ #492403 ] exec() segfaults on closure's func_code Jeremy Hylton <jeremy@alum.mit.edu> parents: 21077 diff changeset	483 if (PyCode_GetNumFree((PyCodeObject *)cmd) > 0) {
18885 22456d0ee737 Fix for SF bug [ #443866 ] Evaluating func_code causing core dump Jeremy Hylton <jeremy@alum.mit.edu> parents: 18836 diff changeset	484 PyErr_SetString(PyExc_TypeError,
22456d0ee737 Fix for SF bug [ #443866 ] Evaluating func_code causing core dump Jeremy Hylton <jeremy@alum.mit.edu> parents: 18836 diff changeset	485 "code object passed to eval() may not contain free variables");
22456d0ee737 Fix for SF bug [ #443866 ] Evaluating func_code causing core dump Jeremy Hylton <jeremy@alum.mit.edu> parents: 18836 diff changeset	486 return NULL;
22456d0ee737 Fix for SF bug [ #443866 ] Evaluating func_code causing core dump Jeremy Hylton <jeremy@alum.mit.edu> parents: 18836 diff changeset	487 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	488 return PyEval_EvalCode((PyCodeObject *) cmd, globals, locals);
18885 22456d0ee737 Fix for SF bug [ #443866 ] Evaluating func_code causing core dump Jeremy Hylton <jeremy@alum.mit.edu> parents: 18836 diff changeset	489 }
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	490
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14662 diff changeset	491 if (!PyString_Check(cmd) &&
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14662 diff changeset	492 !PyUnicode_Check(cmd)) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	493 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	494 "eval() arg 1 must be a string or code object");
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	495 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	496 }
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	497 cf.cf_flags = 0;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	498
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	499 #ifdef Py_USING_UNICODE
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	500 if (PyUnicode_Check(cmd)) {
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	501 tmp = PyUnicode_AsUTF8String(cmd);
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	502 if (tmp == NULL)
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	503 return NULL;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	504 cmd = tmp;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	505 cf.cf_flags \|= PyCF_SOURCE_IS_UTF8;
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	506 }
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	507 #endif
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14662 diff changeset	508 if (PyString_AsStringAndSize(cmd, &str, NULL))
959 68b302ad84a1 use getargs() in more cases; Guido van Rossum <guido@python.org> parents: 955 diff changeset	509 return NULL;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	510 while (str == ' ' \|\| str == '\t')
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	511 str++;
19357 be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	512
be9b50704e4c Fix for bug [#452230] future division isn't propagated. Tim Peters <tim.peters@gmail.com> parents: 19355 diff changeset	513 (void)PyEval_MergeCompilerFlags(&cf);
27781 cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	514 result = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf);
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	515 Py_XDECREF(tmp);
cc01fb654ce3 patch #683515: "Add unicode support to compile(), eval() and exec" Just van Rossum <just@letterror.com> parents: 27681 diff changeset	516 return result;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	517 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	518
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	519 PyDoc_STRVAR(eval_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	520 "eval(source[, globals[, locals]]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	521 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	522 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	523 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	524 or a code object as returned by compile().\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	525 The globals and locals are dictionaries, defaulting to the current\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	526 globals and locals. If only globals is given, locals defaults to it.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	527
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	528
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	529 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	530 builtin_execfile(PyObject self, PyObject args)
673 71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	531 {
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	532 char *filename;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	533 PyObject globals = Py_None, locals = Py_None;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	534 PyObject *res;
19726 5487d9d53a0e builtin_execfile(): initialize another local that the GCC on leroy Guido van Rossum <guido@python.org> parents: 19705 diff changeset	535 FILE* fp = NULL;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18436 diff changeset	536 PyCompilerFlags cf;
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	537 int exists;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	538
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	539 if (!PyArg_ParseTuple(args, "s\|O!O!:execfile",
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	540 &filename,
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	541 &PyDict_Type, &globals,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	542 &PyDict_Type, &locals))
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	543 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	544 if (globals == Py_None) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	545 globals = PyEval_GetGlobals();
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	546 if (locals == Py_None)
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	547 locals = PyEval_GetLocals();
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	548 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	549 else if (locals == Py_None)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	550 locals = globals;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	551 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	552 if (PyDict_SetItemString(globals, "__builtins__",
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	553 PyEval_GetBuiltins()) != 0)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	554 return NULL;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	555 }
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	556
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	557 exists = 0;
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	558 /* Test for existence or directory. */
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	559 #if defined(PLAN9)
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	560 {
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	561 Dir *d;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	562
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	563 if ((d = dirstat(filename))!=nil) {
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	564 if(d->mode & DMDIR)
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	565 werrstr("is a directory");
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	566 else
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	567 exists = 1;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	568 free(d);
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	569 }
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	570 }
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	571 #elif defined(RISCOS)
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	572 if (object_exists(filename)) {
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	573 if (isdir(filename))
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	574 errno = EISDIR;
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	575 else
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	576 exists = 1;
edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20471 diff changeset	577 }
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	578 #else /* standard Posix */
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	579 {
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	580 struct stat s;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	581 if (stat(filename, &s) == 0) {
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	582 if (S_ISDIR(s.st_mode))
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	583 # if defined(PY_OS2) && defined(PYCC_VACPP)
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	584 errno = EOS2ERR;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	585 # else
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	586 errno = EISDIR;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	587 # endif
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	588 else
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	589 exists = 1;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	590 }
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	591 }
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22225 diff changeset	592 #endif
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	593
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	594 if (exists) {
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	595 Py_BEGIN_ALLOW_THREADS
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22785 diff changeset	596 fp = fopen(filename, "r" PY_STDIOTEXTMODE);
19053 2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	597 Py_END_ALLOW_THREADS
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	598
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	599 if (fp == NULL) {
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	600 exists = 0;
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	601 }
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	602 }
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	603
2bb242dc69d8 Patch #448227: Raise an exception when a directory is passed to execfile. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	604 if (!exists) {
25046 434bc1dea4f8 execfile should call PyErr_SetFromErrnoWithFilename instead of Peter Schneider-Kamp <nowonder@nowonder.de> parents: 24863 diff changeset	605 PyErr_SetFromErrnoWithFilename(PyExc_IOError, filename);
673 71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	606 return NULL;
71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	607 }
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18436 diff changeset	608 cf.cf_flags = 0;
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18436 diff changeset	609 if (PyEval_MergeCompilerFlags(&cf))
17641 9be7758a8c94 Fix buglet reported on c.l.py: map(fnc, file.xreadlines()) blows up. Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	610 res = PyRun_FileExFlags(fp, filename, Py_file_input, globals,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17111 diff changeset	611 locals, 1, &cf);
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18436 diff changeset	612 else
17641 9be7758a8c94 Fix buglet reported on c.l.py: map(fnc, file.xreadlines()) blows up. Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	613 res = PyRun_FileEx(fp, filename, Py_file_input, globals,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 17111 diff changeset	614 locals, 1);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	615 return res;
673 71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	616 }
71d496259ad3 Added execfile(). Guido van Rossum <guido@python.org> parents: 662 diff changeset	617
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	618 PyDoc_STRVAR(execfile_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	619 "execfile(filename[, globals[, locals]])\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	620 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	621 Read and execute a Python script from a file.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	622 The globals and locals are dictionaries, defaulting to the current\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	623 globals and locals. If only globals is given, locals defaults to it.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	624
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	625
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	626 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	627 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	628 {
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	629 PyObject v, result, *dflt = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	630 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	631
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	632 if (!PyArg_UnpackTuple(args, "getattr", 2, 3, &v, &name, &dflt))
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	633 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	634 #ifdef Py_USING_UNICODE
18888 f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	635 if (PyUnicode_Check(name)) {
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	636 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	637 if (name == NULL)
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	638 return NULL;
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	639 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	640 #endif
18888 f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	641
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	642 if (!PyString_Check(name)) {
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	643 PyErr_SetString(PyExc_TypeError,
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	644 "attribute name must be string");
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	645 return NULL;
f12e1a766a14 Fix for SF byg [ #420304 ] getattr function w/ default Jeremy Hylton <jeremy@alum.mit.edu> parents: 18885 diff changeset	646 }
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	647 result = PyObject_GetAttr(v, name);
20471 bbdc0abfbb13 SF patch #471852 (anonymous) notes that getattr(obj, name, default) Guido van Rossum <guido@python.org> parents: 20307 diff changeset	648 if (result == NULL && dflt != NULL &&
bbdc0abfbb13 SF patch #471852 (anonymous) notes that getattr(obj, name, default) Guido van Rossum <guido@python.org> parents: 20307 diff changeset	649 PyErr_ExceptionMatches(PyExc_AttributeError))
bbdc0abfbb13 SF patch #471852 (anonymous) notes that getattr(obj, name, default) Guido van Rossum <guido@python.org> parents: 20307 diff changeset	650 {
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	651 PyErr_Clear();
221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	652 Py_INCREF(dflt);
221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	653 result = dflt;
221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	654 }
221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	655 return result;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	656 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	657
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	658 PyDoc_STRVAR(getattr_doc,
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	659 "getattr(object, name[, default]) -> value\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	660 \n\
8581 221667f89064 Experimental feature: add default argument to getattr(). Guido van Rossum <guido@python.org> parents: 8561 diff changeset	661 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	662 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	663 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	664
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	665
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	666 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	667 builtin_globals(PyObject *self)
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	668 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	669 PyObject *d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	670
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	671 d = PyEval_GetGlobals();
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	672 Py_INCREF(d);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	673 return d;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	674 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	675
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	676 PyDoc_STRVAR(globals_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	677 "globals() -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	678 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	679 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	680
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	681
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	682 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	683 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	684 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	685 PyObject *v;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	686 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	687
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	688 if (!PyArg_UnpackTuple(args, "hasattr", 2, 2, &v, &name))
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	689 return NULL;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	690 #ifdef Py_USING_UNICODE
18890 fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	691 if (PyUnicode_Check(name)) {
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	692 name = _PyUnicode_AsDefaultEncodedString(name, NULL);
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	693 if (name == NULL)
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	694 return NULL;
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	695 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	696 #endif
18890 fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	697
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	698 if (!PyString_Check(name)) {
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	699 PyErr_SetString(PyExc_TypeError,
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	700 "attribute name must be string");
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	701 return NULL;
fb837c5ae5d3 Do for hasattr() what was done for getattr() Jeremy Hylton <jeremy@alum.mit.edu> parents: 18888 diff changeset	702 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	703 v = PyObject_GetAttr(v, name);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	704 if (v == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	705 PyErr_Clear();
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	706 Py_INCREF(Py_False);
0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	707 return Py_False;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	708 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	709 Py_DECREF(v);
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	710 Py_INCREF(Py_True);
0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	711 return Py_True;
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	712 }
59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	713
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	714 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	715 "hasattr(object, name) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	716 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	717 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	718 (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	719
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	720
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	721 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	722 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	723 {
13078 1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	724 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	725 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1257 diff changeset	726
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	727 PyDoc_STRVAR(id_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	728 "id(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	729 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	730 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	731 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	732
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	733
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	734 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	735 builtin_map(PyObject self, PyObject args)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	736 {
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	737 typedef struct {
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	738 PyObject it; / the iterator object */
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	739 int saw_StopIteration; /* bool: did the iterator end? */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	740 } sequence;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	741
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	742 PyObject func, result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	743 sequence seqs = NULL, sqp;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	744 int n, len;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	745 register int i, j;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	746
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	747 n = PyTuple_Size(args);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	748 if (n < 2) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	749 PyErr_SetString(PyExc_TypeError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	750 "map() requires at least two args");
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	751 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	752 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	753
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	754 func = PyTuple_GetItem(args, 0);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	755 n--;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	756
8661 30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	757 if (func == Py_None && n == 1) {
30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	758 /* map(None, S) is the same as list(S). */
30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	759 return PySequence_List(PyTuple_GetItem(args, 1));
30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	760 }
30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	761
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	762 /* Get space for sequence descriptors. Must NULL out the iterator
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	763 * pointers so that jumping to Fail_2 later doesn't see trash.
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	764 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	765 if ((seqs = PyMem_NEW(sequence, n)) == NULL) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	766 PyErr_NoMemory();
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	767 return NULL;
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	768 }
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	769 for (i = 0; i < n; ++i) {
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	770 seqs[i].it = (PyObject*)NULL;
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	771 seqs[i].saw_StopIteration = 0;
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	772 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	773
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	774 /* Do a first pass to obtain iterators for the arguments, and set len
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	775 * to the largest of their lengths.
17641 9be7758a8c94 Fix buglet reported on c.l.py: map(fnc, file.xreadlines()) blows up. Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	776 */
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	777 len = 0;
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	778 for (i = 0, sqp = seqs; i < n; ++i, ++sqp) {
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	779 PyObject *curseq;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	780 int curlen;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	781
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	782 /* Get iterator. */
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	783 curseq = PyTuple_GetItem(args, i+1);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	784 sqp->it = PyObject_GetIter(curseq);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	785 if (sqp->it == NULL) {
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	786 static char errmsg[] =
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	787 "argument %d to map() must support iteration";
5388 13a30cea8dbf Avoid sprintf buffer overflow if more than 9999 arguments. Guido van Rossum <guido@python.org> parents: 5373 diff changeset	788 char errbuf[sizeof(errmsg) + 25];
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20871 diff changeset	789 PyOS_snprintf(errbuf, sizeof(errbuf), errmsg, i+2);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	790 PyErr_SetString(PyExc_TypeError, errbuf);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	791 goto Fail_2;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	792 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	793
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	794 /* Update len. */
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	795 curlen = -1; /* unknown */
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	796 if (PySequence_Check(curseq) &&
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	797 curseq->ob_type->tp_as_sequence->sq_length) {
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	798 curlen = PySequence_Size(curseq);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	799 if (curlen < 0)
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	800 PyErr_Clear();
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	801 }
17641 9be7758a8c94 Fix buglet reported on c.l.py: map(fnc, file.xreadlines()) blows up. Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	802 if (curlen < 0)
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	803 curlen = 8; /* arbitrary */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18890 diff changeset	804 if (curlen > len)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18890 diff changeset	805 len = curlen;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	806 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	807
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	808 /* Get space for the result list. */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	809 if ((result = (PyObject *) PyList_New(len)) == NULL)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	810 goto Fail_2;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	811
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	812 /* Iterate over the sequences until all have stopped. */
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	813 for (i = 0; ; ++i) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	814 PyObject alist, item=NULL, *value;
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	815 int numactive = 0;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	816
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	817 if (func == Py_None && n == 1)
2824 65c7105868f8 rename arglist to alist (conflict with new grammar symbol) Guido van Rossum <guido@python.org> parents: 2808 diff changeset	818 alist = NULL;
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	819 else if ((alist = PyTuple_New(n)) == NULL)
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	820 goto Fail_1;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	821
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	822 for (j = 0, sqp = seqs; j < n; ++j, ++sqp) {
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	823 if (sqp->saw_StopIteration) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	824 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	825 item = Py_None;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	826 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	827 else {
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	828 item = PyIter_Next(sqp->it);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	829 if (item)
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	830 ++numactive;
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	831 else {
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	832 if (PyErr_Occurred()) {
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	833 Py_XDECREF(alist);
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	834 goto Fail_1;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	835 }
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	836 Py_INCREF(Py_None);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	837 item = Py_None;
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	838 sqp->saw_StopIteration = 1;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	839 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	840 }
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	841 if (alist)
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	842 PyTuple_SET_ITEM(alist, j, item);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	843 else
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	844 break;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	845 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	846
2824 65c7105868f8 rename arglist to alist (conflict with new grammar symbol) Guido van Rossum <guido@python.org> parents: 2808 diff changeset	847 if (!alist)
65c7105868f8 rename arglist to alist (conflict with new grammar symbol) Guido van Rossum <guido@python.org> parents: 2808 diff changeset	848 alist = item;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	849
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	850 if (numactive == 0) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	851 Py_DECREF(alist);
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	852 break;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	853 }
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	854
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	855 if (func == Py_None)
2824 65c7105868f8 rename arglist to alist (conflict with new grammar symbol) Guido van Rossum <guido@python.org> parents: 2808 diff changeset	856 value = alist;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	857 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	858 value = PyEval_CallObject(func, alist);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	859 Py_DECREF(alist);
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	860 if (value == NULL)
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	861 goto Fail_1;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	862 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	863 if (i >= len) {
9991 ddbbed8cb830 builtin_map(): A better fix for the previous leak plug (remember Barry Warsaw <barry@python.org> parents: 9980 diff changeset	864 int status = PyList_Append(result, value);
ddbbed8cb830 builtin_map(): A better fix for the previous leak plug (remember Barry Warsaw <barry@python.org> parents: 9980 diff changeset	865 Py_DECREF(value);
ddbbed8cb830 builtin_map(): A better fix for the previous leak plug (remember Barry Warsaw <barry@python.org> parents: 9980 diff changeset	866 if (status < 0)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	867 goto Fail_1;
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	868 }
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	869 else if (PyList_SetItem(result, i, value) < 0)
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	870 goto Fail_1;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	871 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	872
8661 30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	873 if (i < len && PyList_SetSlice(result, i, len, NULL) < 0)
30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	874 goto Fail_1;
30fbf18af29e Small changes to map() and filter(): Guido van Rossum <guido@python.org> parents: 8589 diff changeset	875
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	876 goto Succeed;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	877
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	878 Fail_1:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	879 Py_DECREF(result);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	880 Fail_2:
17675 0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	881 result = NULL;
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	882 Succeed:
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	883 assert(seqs);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	884 for (i = 0; i < n; ++i)
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	885 Py_XDECREF(seqs[i].it);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	886 PyMem_DEL(seqs);
0be277039d93 Generalize map() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17667 diff changeset	887 return result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	888 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	889
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	890 PyDoc_STRVAR(map_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	891 "map(function, sequence[, sequence, ...]) -> list\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	892 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	893 Return a list of the results of applying the function to the items of\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	894 the argument sequence(s). If more than one sequence is given, the\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	895 function is called with an argument list consisting of the corresponding\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	896 item of each sequence, substituting None for missing values when not all\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	897 sequences have the same length. If the function is None, return a list of\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	898 the items of the sequence (or a list of tuples if more than one sequence).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	899
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	900
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	901 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	902 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	903 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	904 PyObject *v;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	905 PyObject *name;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	906 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	907
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	908 if (!PyArg_UnpackTuple(args, "setattr", 3, 3, &v, &name, &value))
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	909 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	910 if (PyObject_SetAttr(v, name, value) != 0)
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	911 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	912 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	913 return Py_None;
644 59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	914 }
59f9325bb8ec Added getattr and setattr built-in functions. Guido van Rossum <guido@python.org> parents: 606 diff changeset	915
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	916 PyDoc_STRVAR(setattr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	917 "setattr(object, name, value)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	918 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	919 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	920 ``x.y = v''.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	921
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	922
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	923 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	924 builtin_delattr(PyObject self, PyObject args)
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	925 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	926 PyObject *v;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	927 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	928
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	929 if (!PyArg_UnpackTuple(args, "delattr", 2, 2, &v, &name))
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	930 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	931 if (PyObject_SetAttr(v, name, (PyObject *)NULL) != 0)
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	932 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	933 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	934 return Py_None;
1843 8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	935 }
8294bbd94535 Added delattr() Guido van Rossum <guido@python.org> parents: 1842 diff changeset	936
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	937 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	938 "delattr(object, name)\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	939 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	940 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	941 ``del x.y''.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	942
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	943
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	944 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	945 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	946 {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	947 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	948
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	949 x = PyObject_Hash(v);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	950 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	951 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	952 return PyInt_FromLong(x);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	953 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	954
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	955 PyDoc_STRVAR(hash_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	956 "hash(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	957 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	958 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	959 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	960
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	961
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	962 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	963 builtin_hex(PyObject self, PyObject v)
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	964 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	965 PyNumberMethods *nb;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	966
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	967 if ((nb = v->ob_type->tp_as_number) == NULL \|\|
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	968 nb->nb_hex == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	969 PyErr_SetString(PyExc_TypeError,
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	970 "hex() argument can't be converted to hex");
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	971 return NULL;
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	972 }
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	973 return (*nb->nb_hex)(v);
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	974 }
9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	975
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	976 PyDoc_STRVAR(hex_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	977 "hex(number) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	978 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	979 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	980
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	981
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13446 diff changeset	982 static PyObject builtin_raw_input(PyObject , PyObject *);
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1049 diff changeset	983
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	984 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	985 builtin_input(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	986 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	987 PyObject *line;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	988 char *str;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	989 PyObject *res;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	990 PyObject globals, locals;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	991
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	992 line = builtin_raw_input(self, args);
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1049 diff changeset	993 if (line == NULL)
2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1049 diff changeset	994 return line;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	995 if (!PyArg_Parse(line, "s;embedded '\\0' in input line", &str))
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	996 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	997 while (str == ' ' \|\| str == '\t')
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	998 str++;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	999 globals = PyEval_GetGlobals();
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1000 locals = PyEval_GetLocals();
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1001 if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1002 if (PyDict_SetItemString(globals, "__builtins__",
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1003 PyEval_GetBuiltins()) != 0)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	1004 return NULL;
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2087 diff changeset	1005 }
5438 e926c331ebbf Instead of importing graminit.h whenever one of the three grammar 'root' Guido van Rossum <guido@python.org> parents: 5421 diff changeset	1006 res = PyRun_String(str, Py_eval_input, globals, locals);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1007 Py_DECREF(line);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1008 return res;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1009 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1010
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1011 PyDoc_STRVAR(input_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1012 "input([prompt]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1013 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1014 Equivalent to eval(raw_input(prompt)).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1015
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1016
5092 cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1017 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1018 builtin_intern(PyObject self, PyObject args)
5092 cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1019 {
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1020 PyObject *s;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11800 diff changeset	1021 if (!PyArg_ParseTuple(args, "S:intern", &s))
5092 cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1022 return NULL;
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1023 Py_INCREF(s);
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1024 PyString_InternInPlace(&s);
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1025 return s;
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1026 }
cb7aadd9d9f2 Added intern() function. Guido van Rossum <guido@python.org> parents: 5010 diff changeset	1027
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1028 PyDoc_STRVAR(intern_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1029 "intern(string) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1030 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1031 ``Intern'' the given string. This enters the string in the (global)\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1032 table of interned strings whose purpose is to speed up dictionary lookups.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1033 Return the string itself or the previously interned string object with the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1034 same value.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1035
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1036
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1037 static PyObject *
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1038 builtin_iter(PyObject self, PyObject args)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1039 {
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1040 PyObject v, w = NULL;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1041
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1042 if (!PyArg_UnpackTuple(args, "iter", 1, 2, &v, &w))
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1043 return NULL;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1044 if (w == NULL)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1045 return PyObject_GetIter(v);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1046 if (!PyCallable_Check(v)) {
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1047 PyErr_SetString(PyExc_TypeError,
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1048 "iter(v, w): v must be callable");
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1049 return NULL;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1050 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1051 return PyCallIter_New(v, w);
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1052 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1053
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1054 PyDoc_STRVAR(iter_doc,
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1055 "iter(collection) -> iterator\n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1056 iter(callable, sentinel) -> iterator\n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1057 \n\
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1058 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	1059 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	1060 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	1061
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1062
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17337 diff changeset	1063 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	1064 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	1065 {
8589 97dc6aa532e7 Fix a stupid little bug: len() of an unsized returns -1 and leaves an Guido van Rossum <guido@python.org> parents: 8581 diff changeset	1066 long res;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1067
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13447 diff changeset	1068 res = PyObject_Size(v);
8589 97dc6aa532e7 Fix a stupid little bug: len() of an unsized returns -1 and leaves an Guido van Rossum <guido@python.org> parents: 8581 diff changeset	1069 if (res < 0 && PyErr_Occurred())
97dc6aa532e7 Fix a stupid little bug: len() of an unsized returns -1 and leaves an Guido van Rossum <guido@python.org> parents: 8581 diff changeset	1070 return NULL;
97dc6aa532e7 Fix a stupid little bug: len() of an unsized returns -1 and leaves an Guido van Rossum <guido@python.org> parents: 8581 diff changeset	1071 return PyInt_FromLong(res);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1072 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1073
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1074 PyDoc_STRVAR(len_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1075 "len(object) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1076 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1077 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	1078
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1079
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1080 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	1081 builtin_locals(PyObject *self)
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1082 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1083 PyObject *d;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1084
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1085 d = PyEval_GetLocals();
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1086 Py_INCREF(d);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1087 return d;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1088 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1089
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1090 PyDoc_STRVAR(locals_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1091 "locals() -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1092 \n\
27076 753306f9b0a0 SF bug #655271: Slightly modify locals() doc Raymond Hettinger <python@rcn.com> parents: 26824 diff changeset	1093 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	1094
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1095
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1096 static PyObject *
15949 76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1097 min_max(PyObject *args, int op)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1098 {
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1099 PyObject v, w, x, it;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1100
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1101 if (PyTuple_Size(args) > 1)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1102 v = args;
26824 fb36d9b50df5 Make error message more specific for min() and max(). Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	1103 else if (!PyArg_UnpackTuple(args, (op==Py_LT) ? "min" : "max", 1, 1, &v))
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1104 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	1105
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1106 it = PyObject_GetIter(v);
76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1107 if (it == NULL)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1108 return NULL;
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1109
76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1110 w = NULL; /* the result */
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1111 for (;;) {
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1112 x = PyIter_Next(it);
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1113 if (x == NULL) {
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1114 if (PyErr_Occurred()) {
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1115 Py_XDECREF(w);
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1116 Py_DECREF(it);
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1117 return NULL;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1118 }
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1119 break;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1120 }
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1121
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1122 if (w == NULL)
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1123 w = x;
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1124 else {
15949 76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1125 int cmp = PyObject_RichCompareBool(x, w, op);
76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1126 if (cmp > 0) {
76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1127 Py_DECREF(w);
76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1128 w = x;
76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1129 }
76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1130 else if (cmp < 0) {
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5471 diff changeset	1131 Py_DECREF(x);
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1132 Py_DECREF(w);
76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1133 Py_DECREF(it);
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5471 diff changeset	1134 return NULL;
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5471 diff changeset	1135 }
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1136 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1137 Py_DECREF(x);
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1138 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1139 }
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1140 if (w == NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1141 PyErr_SetString(PyExc_ValueError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	1142 "min() or max() arg is an empty sequence");
17667 76ee8b62ee2a Generalize max(seq) and min(seq) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17654 diff changeset	1143 Py_DECREF(it);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1144 return w;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1145 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1146
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1147 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1148 builtin_min(PyObject self, PyObject v)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1149 {
15949 76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1150 return min_max(v, Py_LT);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1151 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1152
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1153 PyDoc_STRVAR(min_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1154 "min(sequence) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1155 min(a, b, c, ...) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1156 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1157 With a single sequence 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	1158 With two or more arguments, return the smallest argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1159
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1160
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1161 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1162 builtin_max(PyObject self, PyObject v)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1163 {
15949 76ad2a9a3e53 Use rich comparisons in min and max. Guido van Rossum <guido@python.org> parents: 15832 diff changeset	1164 return min_max(v, Py_GT);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1165 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1166
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1167 PyDoc_STRVAR(max_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1168 "max(sequence) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1169 max(a, b, c, ...) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1170 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1171 With a single sequence 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	1172 With two or more arguments, return the largest argument.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1173
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1174
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1175 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	1176 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	1177 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1178 PyNumberMethods *nb;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1179
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	1180 if (v == NULL \|\| (nb = v->ob_type->tp_as_number) == NULL \|\|
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	1181 nb->nb_oct == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1182 PyErr_SetString(PyExc_TypeError,
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	1183 "oct() argument can't be converted to oct");
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	1184 return NULL;
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1185 }
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 972 diff changeset	1186 return (*nb->nb_oct)(v);
404 9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1187 }
9cd38d1ac391 Made dir() more robust. Guido van Rossum <guido@python.org> parents: 385 diff changeset	1188
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1189 PyDoc_STRVAR(oct_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1190 "oct(number) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1191 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1192 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	1193
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1194
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1195 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	1196 builtin_ord(PyObject self, PyObject obj)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1197 {
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	1198 long ord;
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1199 int size;
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	1200
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1201 if (PyString_Check(obj)) {
aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1202 size = PyString_GET_SIZE(obj);
15635 838551869790 Patch #102955, fixing one of the warnings in bug #121479: Andrew M. Kuchling <amk@amk.ca> parents: 15478 diff changeset	1203 if (size == 1) {
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1204 ord = (long)((unsigned char)*PyString_AS_STRING(obj));
15635 838551869790 Patch #102955, fixing one of the warnings in bug #121479: Andrew M. Kuchling <amk@amk.ca> parents: 15478 diff changeset	1205 return PyInt_FromLong(ord);
838551869790 Patch #102955, fixing one of the warnings in bug #121479: Andrew M. Kuchling <amk@amk.ca> parents: 15478 diff changeset	1206 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1207 #ifdef Py_USING_UNICODE
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1208 } else if (PyUnicode_Check(obj)) {
aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1209 size = PyUnicode_GET_SIZE(obj);
15635 838551869790 Patch #102955, fixing one of the warnings in bug #121479: Andrew M. Kuchling <amk@amk.ca> parents: 15478 diff changeset	1210 if (size == 1) {
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1211 ord = (long)*PyUnicode_AS_UNICODE(obj);
15635 838551869790 Patch #102955, fixing one of the warnings in bug #121479: Andrew M. Kuchling <amk@amk.ca> parents: 15478 diff changeset	1212 return PyInt_FromLong(ord);
838551869790 Patch #102955, fixing one of the warnings in bug #121479: Andrew M. Kuchling <amk@amk.ca> parents: 15478 diff changeset	1213 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1214 #endif
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1215 } else {
aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1216 PyErr_Format(PyExc_TypeError,
15654 6405f30aa08c CHange error messages for ord(), using "string" instead of "string or Unicode" Andrew M. Kuchling <amk@amk.ca> parents: 15637 diff changeset	1217 "ord() expected string of length 1, but " \
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1218 "%.200s found", obj->ob_type->tp_name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1219 return NULL;
11973 8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	1220 }
8bdc25d22925 Marc-Andre Lemburg: added new builtin functions unicode() and Guido van Rossum <guido@python.org> parents: 11882 diff changeset	1221
15829 9308dc8c85e0 (Modified) patch by Ping - SF Patch #102681. Guido van Rossum <guido@python.org> parents: 15727 diff changeset	1222 PyErr_Format(PyExc_TypeError,
15654 6405f30aa08c CHange error messages for ord(), using "string" instead of "string or Unicode" Andrew M. Kuchling <amk@amk.ca> parents: 15637 diff changeset	1223 "ord() expected a character, "
6405f30aa08c CHange error messages for ord(), using "string" instead of "string or Unicode" Andrew M. Kuchling <amk@amk.ca> parents: 15637 diff changeset	1224 "but string of length %d found",
12384 aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1225 size);
aa013f2cf80b ord: provide better error messages Jeremy Hylton <jeremy@alum.mit.edu> parents: 12368 diff changeset	1226 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1227 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1228
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1229 PyDoc_STRVAR(ord_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1230 "ord(c) -> integer\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1231 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1232 Return the integer ordinal of a one-character string.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1233
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1234
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1235 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1236 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	1237 {
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	1238 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	1239
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1240 if (!PyArg_UnpackTuple(args, "pow", 2, 3, &v, &w, &z))
2087 65146b52f16b * Python/bltinmodule.c: restructured coerce(), divmod(), pow() to Guido van Rossum <guido@python.org> parents: 2062 diff changeset	1241 return NULL;
8402 0cb0394c2edc A bunch of functions are now properly implemented in abstract.c, and Guido van Rossum <guido@python.org> parents: 8287 diff changeset	1242 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	1243 }
6693c5d87f3a Added long() and support for longs in int() and float(); Guido van Rossum <guido@python.org> parents: 182 diff changeset	1244
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1245 PyDoc_STRVAR(pow_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1246 "pow(x, y[, z]) -> number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1247 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1248 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	1249 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	1250
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1251
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1252 /* Return number of items in range/xrange (lo, hi, step). step > 0
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1253 * required. Return a value < 0 if & only if the true value is too
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1254 * large to fit in a signed long.
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1255 */
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1256 static long
13679 61f65de19e1e Another missed ansification. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	1257 get_len_of_range(long lo, long hi, long step)
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1258 {
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1259 /* -------------------------------------------------------------
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1260 If lo >= hi, the range is empty.
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1261 Else if n values are in the range, the last one is
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1262 lo + (n-1)*step, which must be <= hi-1. Rearranging,
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1263 n <= (hi - lo - 1)/step + 1, so taking the floor of the RHS gives
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1264 the proper value. Since lo < hi in this case, hi-lo-1 >= 0, so
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1265 the RHS is non-negative and so truncation is the same as the
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1266 floor. Letting M be the largest positive long, the worst case
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1267 for the RHS numerator is hi=M, lo=-M-1, and then
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1268 hi-lo-1 = M-(-M-1)-1 = 2*M. Therefore unsigned long has enough
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1269 precision to compute the RHS exactly.
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1270 ---------------------------------------------------------------*/
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1271 long n = 0;
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1272 if (lo < hi) {
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1273 unsigned long uhi = (unsigned long)hi;
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1274 unsigned long ulo = (unsigned long)lo;
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1275 unsigned long diff = uhi - ulo - 1;
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1276 n = (long)(diff / (unsigned long)step + 1);
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1277 }
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1278 return n;
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1279 }
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1280
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1281 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1282 builtin_range(PyObject self, PyObject args)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1283 {
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1284 long ilow = 0, ihigh = 0, istep = 1;
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1285 long bign;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1286 int i, n;
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1287
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1288 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	1289
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1290 if (PyTuple_Size(args) <= 1) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1291 if (!PyArg_ParseTuple(args,
2153 e54b8654f938 fix Alpha bug in (x)range; different __builtins__ initialization Guido van Rossum <guido@python.org> parents: 2120 diff changeset	1292 "l;range() requires 1-3 int arguments",
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1293 &ihigh))
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1294 return NULL;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1295 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1296 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1297 if (!PyArg_ParseTuple(args,
2153 e54b8654f938 fix Alpha bug in (x)range; different __builtins__ initialization Guido van Rossum <guido@python.org> parents: 2120 diff changeset	1298 "ll\|l;range() requires 1-3 int arguments",
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1299 &ilow, &ihigh, &istep))
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1300 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1301 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1302 if (istep == 0) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	1303 PyErr_SetString(PyExc_ValueError, "range() arg 3 must not be zero");
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1304 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1305 }
10279 886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1306 if (istep > 0)
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1307 bign = get_len_of_range(ilow, ihigh, istep);
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1308 else
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1309 bign = get_len_of_range(ihigh, ilow, -istep);
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1310 n = (int)bign;
886ea255f381 Patch by Tim Peters to improve the range checks for range() and Guido van Rossum <guido@python.org> parents: 10020 diff changeset	1311 if (bign < 0 \|\| (long)n != bign) {
9849 5e9ef9d8575b Avoid overflow if possible in calculations for range(); report Guido van Rossum <guido@python.org> parents: 9567 diff changeset	1312 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	1313 "range() result has too many items");
9849 5e9ef9d8575b Avoid overflow if possible in calculations for range(); report Guido van Rossum <guido@python.org> parents: 9567 diff changeset	1314 return NULL;
5e9ef9d8575b Avoid overflow if possible in calculations for range(); report Guido van Rossum <guido@python.org> parents: 9567 diff changeset	1315 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1316 v = PyList_New(n);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1317 if (v == NULL)
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1318 return NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1319 for (i = 0; i < n; i++) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1320 PyObject *w = PyInt_FromLong(ilow);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1321 if (w == NULL) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1322 Py_DECREF(v);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1323 return NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1324 }
8138 9d0310143600 Fred's right -- we need PyList_SET_ITEM(). Guido van Rossum <guido@python.org> parents: 8132 diff changeset	1325 PyList_SET_ITEM(v, i, w);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1326 ilow += istep;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1327 }
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1328 return v;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1329 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1330
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1331 PyDoc_STRVAR(range_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1332 "range([start,] stop[, step]) -> list of integers\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1333 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1334 Return a list containing an arithmetic progression of integers.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1335 range(i, j) returns [i, i+1, i+2, ..., j-1]; start (!) defaults to 0.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1336 When step is given, it specifies the increment (or decrement).\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1337 For example, range(4) returns [0, 1, 2, 3]. The end point is omitted!\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1338 These are exactly the valid indices for a list of 4 elements.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1339
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1340
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1341 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1342 builtin_raw_input(PyObject self, PyObject args)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1343 {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1344 PyObject *v = NULL;
24817 3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1345 PyObject *fin = PySys_GetObject("stdin");
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1346 PyObject *fout = PySys_GetObject("stdout");
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1347
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1348 if (!PyArg_UnpackTuple(args, "[raw_]input", 0, 1, &v))
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1349 return NULL;
24817 3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1350
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1351 if (fin == NULL) {
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1352 PyErr_SetString(PyExc_RuntimeError, "lost sys.stdin");
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1353 return NULL;
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1354 }
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1355 if (fout == NULL) {
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1356 PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1357 return NULL;
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1358 }
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1359 if (PyFile_SoftSpace(fout, 0)) {
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1360 if (PyFile_WriteString(" ", fout) != 0)
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1361 return NULL;
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1362 }
25924 dc4a0336a2a3 Patch #512981: Update readline input stream on sys.stdin/out change. Martin v. Löwis <martin@v.loewis.de> parents: 25046 diff changeset	1363 if (PyFile_Check (fin) && PyFile_Check (fout)
dc4a0336a2a3 Patch #512981: Update readline input stream on sys.stdin/out change. Martin v. Löwis <martin@v.loewis.de> parents: 25046 diff changeset	1364 && isatty(fileno(PyFile_AsFile(fin)))
dc4a0336a2a3 Patch #512981: Update readline input stream on sys.stdin/out change. Martin v. Löwis <martin@v.loewis.de> parents: 25046 diff changeset	1365 && isatty(fileno(PyFile_AsFile(fout)))) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1366 PyObject *po;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1367 char *prompt;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1368 char *s;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1369 PyObject *result;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1370 if (v != NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1371 po = PyObject_Str(v);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1372 if (po == NULL)
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1373 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1374 prompt = PyString_AsString(po);
8560 46fd630dce63 In raw_input(prompt), make sure that str(prompt) really a string Guido van Rossum <guido@python.org> parents: 8451 diff changeset	1375 if (prompt == NULL)
46fd630dce63 In raw_input(prompt), make sure that str(prompt) really a string Guido van Rossum <guido@python.org> parents: 8451 diff changeset	1376 return NULL;
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1377 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1378 else {
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1379 po = NULL;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1380 prompt = "";
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1381 }
25924 dc4a0336a2a3 Patch #512981: Update readline input stream on sys.stdin/out change. Martin v. Löwis <martin@v.loewis.de> parents: 25046 diff changeset	1382 s = PyOS_Readline(PyFile_AsFile (fin), PyFile_AsFile (fout),
dc4a0336a2a3 Patch #512981: Update readline input stream on sys.stdin/out change. Martin v. Löwis <martin@v.loewis.de> parents: 25046 diff changeset	1383 prompt);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1384 Py_XDECREF(po);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1385 if (s == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1386 PyErr_SetNone(PyExc_KeyboardInterrupt);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1387 return NULL;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1388 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1389 if (*s == '\0') {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1390 PyErr_SetNone(PyExc_EOFError);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1391 result = NULL;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1392 }
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1393 else { /* strip trailing '\n' */
13078 1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	1394 size_t len = strlen(s);
1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	1395 if (len > INT_MAX) {
24817 3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1396 PyErr_SetString(PyExc_OverflowError,
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1397 "input too long");
13078 1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	1398 result = NULL;
1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	1399 }
1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	1400 else {
24817 3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1401 result = PyString_FromStringAndSize(s,
3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1402 (int)(len-1));
13078 1d0407960953 Trent Mick: Guido van Rossum <guido@python.org> parents: 12961 diff changeset	1403 }
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1404 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12572 diff changeset	1405 PyMem_FREE(s);
2808 9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1406 return result;
9318ac51691e added locals() and globals(); [raw_]input() uses readline() Guido van Rossum <guido@python.org> parents: 2375 diff changeset	1407 }
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 253 diff changeset	1408 if (v != NULL) {
24817 3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1409 if (PyFile_WriteObject(v, fout, Py_PRINT_RAW) != 0)
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 253 diff changeset	1410 return NULL;
6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 253 diff changeset	1411 }
24817 3ae8e3ff7e3f Patch #550192: Set softspace to 0 in raw_input(). Martin v. Löwis <martin@v.loewis.de> parents: 24737 diff changeset	1412 return PyFile_GetLine(fin, -1);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1413 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1414
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1415 PyDoc_STRVAR(raw_input_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1416 "raw_input([prompt]) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1417 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1418 Read a string from standard input. The trailing newline is stripped.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1419 If the user hits EOF (Unix: Ctl-D, Windows: Ctl-Z+Return), raise EOFError.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1420 On Unix, GNU readline is used if enabled. The prompt string, if given,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1421 is printed without a trailing newline before reading.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1422
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1423
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1424 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1425 builtin_reduce(PyObject self, PyObject args)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1426 {
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1427 PyObject seq, func, result = NULL, it;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1428
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1429 if (!PyArg_UnpackTuple(args, "reduce", 2, 3, &func, &seq, &result))
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1430 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1431 if (result != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1432 Py_INCREF(result);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1433
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1434 it = PyObject_GetIter(seq);
bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1435 if (it == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1436 PyErr_SetString(PyExc_TypeError,
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1437 "reduce() arg 2 must support iteration");
bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1438 Py_XDECREF(result);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1439 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1440 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1441
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1442 if ((args = PyTuple_New(2)) == NULL)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1443 goto Fail;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1444
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1445 for (;;) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1446 PyObject *op2;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1447
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1448 if (args->ob_refcnt > 1) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1449 Py_DECREF(args);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1450 if ((args = PyTuple_New(2)) == NULL)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1451 goto Fail;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1452 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1453
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1454 op2 = PyIter_Next(it);
bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1455 if (op2 == NULL) {
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1456 if (PyErr_Occurred())
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1457 goto Fail;
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17677 diff changeset	1458 break;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1459 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1460
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1461 if (result == NULL)
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1462 result = op2;
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1463 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1464 PyTuple_SetItem(args, 0, result);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1465 PyTuple_SetItem(args, 1, op2);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1466 if ((result = PyEval_CallObject(func, args)) == NULL)
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1467 goto Fail;
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1468 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1469 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1470
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1471 Py_DECREF(args);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1472
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1473 if (result == NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1474 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	1475 "reduce() of empty sequence with no initial value");
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1476
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1477 Py_DECREF(it);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1478 return result;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1479
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1480 Fail:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1481 Py_XDECREF(args);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1482 Py_XDECREF(result);
17677 bf7f166d3c97 Generalize reduce() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17675 diff changeset	1483 Py_DECREF(it);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1484 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1485 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1486
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1487 PyDoc_STRVAR(reduce_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1488 "reduce(function, sequence[, initial]) -> value\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1489 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1490 Apply a function of two arguments cumulatively to the items of a sequence,\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1491 from left to right, so as to reduce the sequence to a single value.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1492 For example, reduce(lambda x, y: x+y, [1, 2, 3, 4, 5]) calculates\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1493 ((((1+2)+3)+4)+5). If initial is present, it is placed before the items\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1494 of the sequence in the calculation, and serves as a default when the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1495 sequence is empty.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1496
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1497
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1498 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	1499 builtin_reload(PyObject self, PyObject v)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1500 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1501 return PyImport_ReloadModule(v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1502 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1503
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1504 PyDoc_STRVAR(reload_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1505 "reload(module) -> module\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1506 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1507 Reload the module. The module must have been successfully imported before.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1508
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1509
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1510 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	1511 builtin_repr(PyObject self, PyObject v)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	1512 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1513 return PyObject_Repr(v);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	1514 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1079 diff changeset	1515
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1516 PyDoc_STRVAR(repr_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1517 "repr(object) -> string\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1518 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1519 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	1520 For most object types, eval(repr(object)) == object.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1521
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1522
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1523 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1524 builtin_round(PyObject self, PyObject args)
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1525 {
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1526 double x;
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1527 double f;
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1528 int ndigits = 0;
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1529 int i;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1530
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1531 if (!PyArg_ParseTuple(args, "d\|i:round", &x, &ndigits))
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1532 return NULL;
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1533 f = 1.0;
8287 d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1534 i = abs(ndigits);
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1535 while (--i >= 0)
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1536 f = f*10.0;
8287 d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1537 if (ndigits < 0)
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1538 x /= f;
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1539 else
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1540 x *= f;
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1541 if (x >= 0.0)
8287 d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1542 x = floor(x + 0.5);
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1543 else
8287 d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1544 x = ceil(x - 0.5);
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1545 if (ndigits < 0)
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1546 x *= f;
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1547 else
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1548 x /= f;
d3bf3c2ad75a Implement round() slightly different, so that for negative ndigits no Guido van Rossum <guido@python.org> parents: 8138 diff changeset	1549 return PyFloat_FromDouble(x);
1215 9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1550 }
9d6cf529bb71 bltinmodule.c: added round(x, [n]); coerce() of two class instances Guido van Rossum <guido@python.org> parents: 1096 diff changeset	1551
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1552 PyDoc_STRVAR(round_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1553 "round(number[, ndigits]) -> floating point number\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1554 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1555 Round a number to a given precision in decimal digits (default 0 digits).\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1556 This always returns a floating point number. Precision may be negative.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1557
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1558
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1559 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1560 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	1561 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1562 PyObject *v = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1563 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	1564
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1565 if (!PyArg_UnpackTuple(args, "vars", 0, 1, &v))
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2002 diff changeset	1566 return NULL;
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1567 if (v == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1568 d = PyEval_GetLocals();
2857 eebbdbee54f9 be more suspicious of getlocals() Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1569 if (d == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1570 if (!PyErr_Occurred())
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1571 PyErr_SetString(PyExc_SystemError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1572 "no locals!?");
2857 eebbdbee54f9 be more suspicious of getlocals() Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1573 }
eebbdbee54f9 be more suspicious of getlocals() Guido van Rossum <guido@python.org> parents: 2844 diff changeset	1574 else
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1575 Py_INCREF(d);
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1576 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1577 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1578 d = PyObject_GetAttrString(v, "__dict__");
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1579 if (d == NULL) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1580 PyErr_SetString(PyExc_TypeError,
1840 bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1581 "vars() argument must have __dict__ attribute");
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1582 return NULL;
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1583 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1584 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1585 return d;
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1586 }
bfd11620a2d8 * Python/bltinmodule.c (builtin_vars): correct typo in error msg Guido van Rossum <guido@python.org> parents: 1444 diff changeset	1587
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1588 PyDoc_STRVAR(vars_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1589 "vars([object]) -> dictionary\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1590 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1591 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	1592 With an argument, equivalent to object.__dict__.");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1593
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1594 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1595 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	1596 {
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1597 PyObject *inst;
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1598 PyObject *cls;
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 16048 diff changeset	1599 int retval;
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1600
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1601 if (!PyArg_UnpackTuple(args, "isinstance", 2, 2, &inst, &cls))
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1602 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	1603
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 16048 diff changeset	1604 retval = PyObject_IsInstance(inst, cls);
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 16048 diff changeset	1605 if (retval < 0)
15829 9308dc8c85e0 (Modified) patch by Ping - SF Patch #102681. Guido van Rossum <guido@python.org> parents: 15727 diff changeset	1606 return NULL;
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	1607 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	1608 }
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1609
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1610 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	1611 "isinstance(object, class-or-type-or-tuple) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1612 \n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1613 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	1614 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	1615 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	1616 isinstance(x, A) or isinstance(x, B) or ... (etc.).");
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1617
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1618
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1619 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1620 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	1621 {
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1622 PyObject *derived;
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1623 PyObject *cls;
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1624 int retval;
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1625
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26612 diff changeset	1626 if (!PyArg_UnpackTuple(args, "issubclass", 2, 2, &derived, &cls))
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1627 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	1628
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 16048 diff changeset	1629 retval = PyObject_IsSubclass(derived, cls);
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 16048 diff changeset	1630 if (retval < 0)
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 16048 diff changeset	1631 return NULL;
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	1632 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	1633 }
341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1634
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1635 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	1636 "issubclass(C, B) -> bool\n\
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1637 \n\
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 25924 diff changeset	1638 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	1639 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	1640 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	1641
6145 341fcb7bad90 Two new built-in functions: issubclass() and isinstance(). Both take Barry Warsaw <barry@python.org> parents: 5926 diff changeset	1642
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1643 static PyObject*
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1644 builtin_zip(PyObject self, PyObject args)
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1645 {
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1646 PyObject *ret;
23305 ef6e31f0cee1 builtin_zip(): Take a good guess at how big the result list will be, Tim Peters <tim.peters@gmail.com> parents: 23295 diff changeset	1647 const int itemsize = PySequence_Length(args);
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1648 int i;
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1649 PyObject itlist; / tuple of iterators */
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	1650 int len; /* guess at result length */
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1651
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1652 if (itemsize < 1) {
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1653 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14869 diff changeset	1654 "zip() requires at least one sequence");
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1655 return NULL;
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1656 }
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1657 /* args must be a tuple */
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1658 assert(PyTuple_Check(args));
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1659
23421 642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1660 /* Guess at result length: the shortest of the input lengths.
642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1661 If some argument refuses to say, we refuse to guess too, lest
642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1662 an argument like xrange(sys.maxint) lead us astray.*/
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	1663 len = -1; /* unknown */
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	1664 for (i = 0; i < itemsize; ++i) {
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	1665 PyObject *item = PyTuple_GET_ITEM(args, i);
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	1666 int thislen = PySequence_Length(item);
23421 642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1667 if (thislen < 0) {
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	1668 PyErr_Clear();
23421 642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1669 len = -1;
642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1670 break;
642a453e7a2e SF bug 555042: zip() may trigger MemoryError. Tim Peters <tim.peters@gmail.com> parents: 23305 diff changeset	1671 }
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	1672 else if (len < 0 \|\| thislen < len)
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	1673 len = thislen;
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	1674 }
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	1675
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1676 /* allocate result list */
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	1677 if (len < 0)
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	1678 len = 10; /* arbitrary */
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	1679 if ((ret = PyList_New(len)) == NULL)
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1680 return NULL;
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1681
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1682 /* obtain iterators */
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1683 itlist = PyTuple_New(itemsize);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1684 if (itlist == NULL)
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1685 goto Fail_ret;
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1686 for (i = 0; i < itemsize; ++i) {
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1687 PyObject *item = PyTuple_GET_ITEM(args, i);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1688 PyObject *it = PyObject_GetIter(item);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1689 if (it == NULL) {
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1690 if (PyErr_ExceptionMatches(PyExc_TypeError))
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1691 PyErr_Format(PyExc_TypeError,
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1692 "zip argument #%d must support iteration",
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1693 i+1);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1694 goto Fail_ret_itlist;
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1695 }
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1696 PyTuple_SET_ITEM(itlist, i, it);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1697 }
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1698
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1699 /* build result into ret list */
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	1700 for (i = 0; ; ++i) {
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	1701 int j;
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1702 PyObject *next = PyTuple_New(itemsize);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1703 if (!next)
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1704 goto Fail_ret_itlist;
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1705
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	1706 for (j = 0; j < itemsize; j++) {
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	1707 PyObject *it = PyTuple_GET_ITEM(itlist, j);
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1708 PyObject *item = PyIter_Next(it);
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1709 if (!item) {
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1710 if (PyErr_Occurred()) {
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1711 Py_DECREF(ret);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1712 ret = NULL;
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1713 }
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1714 Py_DECREF(next);
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1715 Py_DECREF(itlist);
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	1716 goto Done;
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1717 }
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	1718 PyTuple_SET_ITEM(next, j, item);
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1719 }
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1720
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	1721 if (i < len)
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	1722 PyList_SET_ITEM(ret, i, next);
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	1723 else {
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	1724 int status = PyList_Append(ret, next);
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	1725 Py_DECREF(next);
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	1726 ++len;
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	1727 if (status < 0)
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	1728 goto Fail_ret_itlist;
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	1729 }
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1730 }
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1731
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	1732 Done:
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	1733 if (ret != NULL && i < len) {
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	1734 /* The list is too big. */
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	1735 if (PyList_SetSlice(ret, i, len, NULL) < 0)
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	1736 return NULL;
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	1737 }
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	1738 return ret;
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	1739
17694 aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1740 Fail_ret_itlist:
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1741 Py_DECREF(itlist);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1742 Fail_ret:
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1743 Py_DECREF(ret);
aab6c1f19289 Generalize zip() to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1744 return NULL;
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1745 }
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1746
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1747
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1748 PyDoc_STRVAR(zip_doc,
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1749 "zip(seq1 [, seq2 [...]]) -> [(seq1[0], seq2[0] ...), (...)]\n\
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1750 \n\
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1751 Return a list of tuples, where each tuple contains the i-th element\n\
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1752 from each of the argument sequences. The returned list is truncated\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1753 in length to the length of the shortest argument sequence.");
13822 c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1754
c57b574e6766 Both PEP 201 Lockstep Iteration and SF patch #101030 have been Barry Warsaw <barry@python.org> parents: 13761 diff changeset	1755
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1756 static PyMethodDef builtin_methods[] = {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1757 {"__import__", builtin___import__, METH_VARARGS, import_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1758 {"abs", builtin_abs, METH_O, abs_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1759 {"apply", builtin_apply, METH_VARARGS, apply_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1760 {"callable", builtin_callable, METH_O, callable_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1761 {"chr", builtin_chr, METH_VARARGS, chr_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1762 {"cmp", builtin_cmp, METH_VARARGS, cmp_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1763 {"coerce", builtin_coerce, METH_VARARGS, coerce_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1764 {"compile", builtin_compile, METH_VARARGS, compile_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1765 {"delattr", builtin_delattr, METH_VARARGS, delattr_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1766 {"dir", builtin_dir, METH_VARARGS, dir_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1767 {"divmod", builtin_divmod, METH_VARARGS, divmod_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1768 {"eval", builtin_eval, METH_VARARGS, eval_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1769 {"execfile", builtin_execfile, METH_VARARGS, execfile_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1770 {"filter", builtin_filter, METH_VARARGS, filter_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1771 {"getattr", builtin_getattr, METH_VARARGS, getattr_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1772 {"globals", (PyCFunction)builtin_globals, METH_NOARGS, globals_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1773 {"hasattr", builtin_hasattr, METH_VARARGS, hasattr_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1774 {"hash", builtin_hash, METH_O, hash_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1775 {"hex", builtin_hex, METH_O, hex_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1776 {"id", builtin_id, METH_O, id_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1777 {"input", builtin_input, METH_VARARGS, input_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1778 {"intern", builtin_intern, METH_VARARGS, intern_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1779 {"isinstance", builtin_isinstance, METH_VARARGS, isinstance_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1780 {"issubclass", builtin_issubclass, METH_VARARGS, issubclass_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1781 {"iter", builtin_iter, METH_VARARGS, iter_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1782 {"len", builtin_len, METH_O, len_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1783 {"locals", (PyCFunction)builtin_locals, METH_NOARGS, locals_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1784 {"map", builtin_map, METH_VARARGS, map_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1785 {"max", builtin_max, METH_VARARGS, max_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1786 {"min", builtin_min, METH_VARARGS, min_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1787 {"oct", builtin_oct, METH_O, oct_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1788 {"ord", builtin_ord, METH_O, ord_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1789 {"pow", builtin_pow, METH_VARARGS, pow_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1790 {"range", builtin_range, METH_VARARGS, range_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1791 {"raw_input", builtin_raw_input, METH_VARARGS, raw_input_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1792 {"reduce", builtin_reduce, METH_VARARGS, reduce_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1793 {"reload", builtin_reload, METH_O, reload_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1794 {"repr", builtin_repr, METH_O, repr_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1795 {"round", builtin_round, METH_VARARGS, round_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1796 {"setattr", builtin_setattr, METH_VARARGS, setattr_doc},
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1797 #ifdef Py_USING_UNICODE
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1798 {"unichr", builtin_unichr, METH_VARARGS, unichr_doc},
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1799 #endif
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1800 {"vars", builtin_vars, METH_VARARGS, vars_doc},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19061 diff changeset	1801 {"zip", builtin_zip, METH_VARARGS, zip_doc},
480 c64c6702549d Added "apply"; added "SyntaxError"; changed table lay-out. Guido van Rossum <guido@python.org> parents: 463 diff changeset	1802 {NULL, NULL},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1803 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1804
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1805 PyDoc_STRVAR(builtin_doc,
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1806 "Built-in functions, exceptions, and other objects.\n\
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1807 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23695 diff changeset	1808 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	1809
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1810 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1811 _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	1812 {
12961 eb911eca9ee9 Christopher Fandrich <cfandrich@8cs.com>: Fred Drake <fdrake@acm.org> parents: 12756 diff changeset	1813 PyObject mod, dict, *debug;
8561 8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1814 mod = Py_InitModule4("__builtin__", builtin_methods,
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1815 builtin_doc, (PyObject *)NULL,
8973e7085cf4 Added doc strings. Guido van Rossum <guido@python.org> parents: 8560 diff changeset	1816 PYTHON_API_VERSION);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1817 if (mod == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1818 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1819 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	1820
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1821 #define SETBUILTIN(NAME, OBJECT) \
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1822 if (PyDict_SetItemString(dict, NAME, (PyObject *)OBJECT) < 0) \
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1823 return NULL
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1824
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1825 SETBUILTIN("None", Py_None);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1826 SETBUILTIN("Ellipsis", Py_Ellipsis);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1827 SETBUILTIN("NotImplemented", Py_NotImplemented);
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	1828 SETBUILTIN("False", Py_False);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22205 diff changeset	1829 SETBUILTIN("True", Py_True);
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	1830 SETBUILTIN("basestring", &PyBaseString_Type);
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	1831 SETBUILTIN("bool", &PyBool_Type);
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23832 diff changeset	1832 SETBUILTIN("buffer", &PyBuffer_Type);
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1833 SETBUILTIN("classmethod", &PyClassMethod_Type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18890 diff changeset	1834 #ifndef WITHOUT_COMPLEX
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1835 SETBUILTIN("complex", &PyComplex_Type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18890 diff changeset	1836 #endif
20754 272336648d1f Rename "dictionary" (type and constructor) to "dict". Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	1837 SETBUILTIN("dict", &PyDict_Type);
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	1838 SETBUILTIN("enumerate", &PyEnum_Type);
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1839 SETBUILTIN("float", &PyFloat_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1840 SETBUILTIN("property", &PyProperty_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1841 SETBUILTIN("int", &PyInt_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1842 SETBUILTIN("list", &PyList_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1843 SETBUILTIN("long", &PyLong_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1844 SETBUILTIN("object", &PyBaseObject_Type);
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23832 diff changeset	1845 SETBUILTIN("slice", &PySlice_Type);
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1846 SETBUILTIN("staticmethod", &PyStaticMethod_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1847 SETBUILTIN("str", &PyString_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1848 SETBUILTIN("super", &PySuper_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1849 SETBUILTIN("tuple", &PyTuple_Type);
de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1850 SETBUILTIN("type", &PyType_Type);
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23597 diff changeset	1851 SETBUILTIN("xrange", &PyRange_Type);
19903 c082971823ce Get rid of builtin_open() entirely (the C code and docstring, not the Tim Peters <tim.peters@gmail.com> parents: 19902 diff changeset	1852
c082971823ce Get rid of builtin_open() entirely (the C code and docstring, not the Tim Peters <tim.peters@gmail.com> parents: 19902 diff changeset	1853 /* Note that open() is just an alias of file(). */
c082971823ce Get rid of builtin_open() entirely (the C code and docstring, not the Tim Peters <tim.peters@gmail.com> parents: 19902 diff changeset	1854 SETBUILTIN("open", &PyFile_Type);
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1855 SETBUILTIN("file", &PyFile_Type);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1856 #ifdef Py_USING_UNICODE
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1857 SETBUILTIN("unicode", &PyUnicode_Type);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1858 #endif
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	1859 debug = PyBool_FromLong(Py_OptimizeFlag == 0);
12961 eb911eca9ee9 Christopher Fandrich <cfandrich@8cs.com>: Fred Drake <fdrake@acm.org> parents: 12756 diff changeset	1860 if (PyDict_SetItemString(dict, "__debug__", debug) < 0) {
eb911eca9ee9 Christopher Fandrich <cfandrich@8cs.com>: Fred Drake <fdrake@acm.org> parents: 12756 diff changeset	1861 Py_XDECREF(debug);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1862 return NULL;
12961 eb911eca9ee9 Christopher Fandrich <cfandrich@8cs.com>: Fred Drake <fdrake@acm.org> parents: 12756 diff changeset	1863 }
eb911eca9ee9 Christopher Fandrich <cfandrich@8cs.com>: Fred Drake <fdrake@acm.org> parents: 12756 diff changeset	1864 Py_XDECREF(debug);
6198 c43ca8dd0081 Removed obsolete exception PyExc_AccessError. Barry Warsaw <barry@python.org> parents: 6145 diff changeset	1865
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5610 diff changeset	1866 return mod;
19902 de39956b5458 _PyBuiltin_Init(): For clarity, macroize this purely repetitive code. Tim Peters <tim.peters@gmail.com> parents: 19894 diff changeset	1867 #undef SETBUILTIN
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1868 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	1869
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1387 diff changeset	1870 /* Helper for filter(): filter a tuple through a function */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1871
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1872 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1873 filtertuple(PyObject func, PyObject tuple)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1874 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1875 PyObject *result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1876 register int i, j;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1877 int len = PyTuple_Size(tuple);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1878
2890 04e1690fb4d1 avoid resize of 0-length tuple Guido van Rossum <guido@python.org> parents: 2857 diff changeset	1879 if (len == 0) {
27681 e5454fe1aafd Make sure filter() never returns tuple, str or unicode Walter Dörwald <walter@livinglogic.de> parents: 27675 diff changeset	1880 if (PyTuple_CheckExact(tuple))
e5454fe1aafd Make sure filter() never returns tuple, str or unicode Walter Dörwald <walter@livinglogic.de> parents: 27675 diff changeset	1881 Py_INCREF(tuple);
e5454fe1aafd Make sure filter() never returns tuple, str or unicode Walter Dörwald <walter@livinglogic.de> parents: 27675 diff changeset	1882 else
e5454fe1aafd Make sure filter() never returns tuple, str or unicode Walter Dörwald <walter@livinglogic.de> parents: 27675 diff changeset	1883 tuple = PyTuple_New(0);
2890 04e1690fb4d1 avoid resize of 0-length tuple Guido van Rossum <guido@python.org> parents: 2857 diff changeset	1884 return tuple;
04e1690fb4d1 avoid resize of 0-length tuple Guido van Rossum <guido@python.org> parents: 2857 diff changeset	1885 }
04e1690fb4d1 avoid resize of 0-length tuple Guido van Rossum <guido@python.org> parents: 2857 diff changeset	1886
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1887 if ((result = PyTuple_New(len)) == NULL)
1387 f992ac2a38d5 * rangeobject.{c,h}, bltinmodule.c: removed non-essential ops from range Guido van Rossum <guido@python.org> parents: 1380 diff changeset	1888 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1889
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1890 for (i = j = 0; i < len; ++i) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1891 PyObject item, good;
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1892 int ok;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1893
27795 2042e2051d97 Change filtertuple() to use tp_as_sequence->sq_item Walter Dörwald <walter@livinglogic.de> parents: 27790 diff changeset	1894 if (tuple->ob_type->tp_as_sequence &&
2042e2051d97 Change filtertuple() to use tp_as_sequence->sq_item Walter Dörwald <walter@livinglogic.de> parents: 27790 diff changeset	1895 tuple->ob_type->tp_as_sequence->sq_item) {
2042e2051d97 Change filtertuple() to use tp_as_sequence->sq_item Walter Dörwald <walter@livinglogic.de> parents: 27790 diff changeset	1896 item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i);
2042e2051d97 Change filtertuple() to use tp_as_sequence->sq_item Walter Dörwald <walter@livinglogic.de> parents: 27790 diff changeset	1897 } else {
2042e2051d97 Change filtertuple() to use tp_as_sequence->sq_item Walter Dörwald <walter@livinglogic.de> parents: 27790 diff changeset	1898 PyErr_SetString(PyExc_TypeError, "unsubscriptable object");
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1899 goto Fail_1;
27795 2042e2051d97 Change filtertuple() to use tp_as_sequence->sq_item Walter Dörwald <walter@livinglogic.de> parents: 27790 diff changeset	1900 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1901 if (func == Py_None) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1902 Py_INCREF(item);
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1903 good = item;
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1904 }
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1905 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1906 PyObject *arg = Py_BuildValue("(O)", item);
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1907 if (arg == NULL)
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1908 goto Fail_1;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1909 good = PyEval_CallObject(func, arg);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1910 Py_DECREF(arg);
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1911 if (good == NULL)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1912 goto Fail_1;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1913 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1914 ok = PyObject_IsTrue(good);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1915 Py_DECREF(good);
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1916 if (ok) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1917 Py_INCREF(item);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1918 if (PyTuple_SetItem(result, j++, item) < 0)
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1919 goto Fail_1;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1920 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1921 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1922
17976 d579a5d8b3fe Cruft cleanup: Removed the unused last_is_sticky argument from the internal Tim Peters <tim.peters@gmail.com> parents: 17874 diff changeset	1923 if (_PyTuple_Resize(&result, j) < 0)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1924 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1925
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1926 return result;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1927
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1928 Fail_1:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1929 Py_DECREF(result);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1930 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1931 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1932
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1933
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1387 diff changeset	1934 /* Helper for filter(): filter a string through a function */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1935
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1936 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1937 filterstring(PyObject func, PyObject strobj)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1938 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1939 PyObject *result;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1940 register int i, j;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1941 int len = PyString_Size(strobj);
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1942 int outlen = len;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1943
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1944 if (func == Py_None) {
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1945 /* If it's a real string we can return the original,
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1946 * as no character is ever false and __getitem__
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1947 * does return this character. If it's a subclass
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1948 * we must go through the __getitem__ loop */
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1949 if (PyString_CheckExact(strobj)) {
27681 e5454fe1aafd Make sure filter() never returns tuple, str or unicode Walter Dörwald <walter@livinglogic.de> parents: 27675 diff changeset	1950 Py_INCREF(strobj);
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1951 return strobj;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1952 }
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1953 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	1954 if ((result = PyString_FromStringAndSize(NULL, len)) == NULL)
1387 f992ac2a38d5 * rangeobject.{c,h}, bltinmodule.c: removed non-essential ops from range Guido van Rossum <guido@python.org> parents: 1380 diff changeset	1955 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1956
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1957 for (i = j = 0; i < len; ++i) {
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1958 PyObject *item;
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1959 int ok;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	1960
1375 f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1961 item = (*strobj->ob_type->tp_as_sequence->sq_item)(strobj, i);
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1962 if (item == NULL)
f3a325662d39 * listobject.c (list_ass_slice): XDECREF instead of DECREF so Guido van Rossum <guido@python.org> parents: 1369 diff changeset	1963 goto Fail_1;
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1964 if (func==Py_None) {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1965 ok = 1;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1966 } else {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1967 PyObject arg, good;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1968 arg = Py_BuildValue("(O)", item);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1969 if (arg == NULL) {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1970 Py_DECREF(item);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1971 goto Fail_1;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1972 }
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1973 good = PyEval_CallObject(func, arg);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1974 Py_DECREF(arg);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1975 if (good == NULL) {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1976 Py_DECREF(item);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1977 goto Fail_1;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1978 }
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1979 ok = PyObject_IsTrue(good);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	1980 Py_DECREF(good);
17337 96ea0eccdb31 SF patch #413552 - Premature decref on object Tim Peters <tim.peters@gmail.com> parents: 17125 diff changeset	1981 }
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1982 if (ok) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1983 int reslen;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1984 if (!PyString_Check(item)) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1985 PyErr_SetString(PyExc_TypeError, "can't filter str to str:"
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1986 " __getitem__ returned different type");
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1987 Py_DECREF(item);
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1988 goto Fail_1;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1989 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1990 reslen = PyString_GET_SIZE(item);
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1991 if (reslen == 1) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1992 PyString_AS_STRING(result)[j++] =
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1993 PyString_AS_STRING(item)[0];
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1994 } else {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1995 /* do we need more space? */
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1996 int need = j + reslen + len-i-1;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1997 if (need > outlen) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1998 /* overallocate, to avoid reallocations */
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	1999 if (need<2*outlen)
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2000 need = 2*outlen;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2001 if (_PyString_Resize(&result, need)) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2002 Py_DECREF(item);
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2003 return NULL;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2004 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2005 outlen = need;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2006 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2007 memcpy(
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2008 PyString_AS_STRING(result) + j,
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2009 PyString_AS_STRING(item),
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2010 reslen
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2011 );
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2012 j += reslen;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2013 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2014 }
17337 96ea0eccdb31 SF patch #413552 - Premature decref on object Tim Peters <tim.peters@gmail.com> parents: 17125 diff changeset	2015 Py_DECREF(item);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2016 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2017
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2018 if (j < outlen)
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23285 diff changeset	2019 _PyString_Resize(&result, j);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2020
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2021 return result;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2022
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2023 Fail_1:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	2024 Py_DECREF(result);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2025 return NULL;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1360 diff changeset	2026 }
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2027
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2028 #ifdef Py_USING_UNICODE
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2029 /* Helper for filter(): filter a Unicode object through a function */
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2030
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2031 static PyObject *
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2032 filterunicode(PyObject func, PyObject strobj)
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2033 {
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2034 PyObject *result;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2035 register int i, j;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2036 int len = PyUnicode_GetSize(strobj);
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2037 int outlen = len;
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2038
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2039 if (func == Py_None) {
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2040 /* If it's a real string we can return the original,
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2041 * as no character is ever false and __getitem__
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2042 * does return this character. If it's a subclass
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2043 * we must go through the __getitem__ loop */
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2044 if (PyUnicode_CheckExact(strobj)) {
27681 e5454fe1aafd Make sure filter() never returns tuple, str or unicode Walter Dörwald <walter@livinglogic.de> parents: 27675 diff changeset	2045 Py_INCREF(strobj);
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2046 return strobj;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2047 }
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2048 }
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2049 if ((result = PyUnicode_FromUnicode(NULL, len)) == NULL)
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2050 return NULL;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2051
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2052 for (i = j = 0; i < len; ++i) {
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2053 PyObject item, arg, *good;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2054 int ok;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2055
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2056 item = (*strobj->ob_type->tp_as_sequence->sq_item)(strobj, i);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2057 if (item == NULL)
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2058 goto Fail_1;
27786 f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2059 if (func == Py_None) {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2060 ok = 1;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2061 } else {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2062 arg = Py_BuildValue("(O)", item);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2063 if (arg == NULL) {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2064 Py_DECREF(item);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2065 goto Fail_1;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2066 }
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2067 good = PyEval_CallObject(func, arg);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2068 Py_DECREF(arg);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2069 if (good == NULL) {
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2070 Py_DECREF(item);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2071 goto Fail_1;
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2072 }
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2073 ok = PyObject_IsTrue(good);
f34446fa216e Change filterstring() and filterunicode(): If the Walter Dörwald <walter@livinglogic.de> parents: 27782 diff changeset	2074 Py_DECREF(good);
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2075 }
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2076 if (ok) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2077 int reslen;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2078 if (!PyUnicode_Check(item)) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2079 PyErr_SetString(PyExc_TypeError, "can't filter unicode to unicode:"
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2080 " __getitem__ returned different type");
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2081 Py_DECREF(item);
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2082 goto Fail_1;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2083 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2084 reslen = PyUnicode_GET_SIZE(item);
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2085 if (reslen == 1) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2086 PyUnicode_AS_UNICODE(result)[j++] =
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2087 PyUnicode_AS_UNICODE(item)[0];
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2088 } else {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2089 /* do we need more space? */
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2090 int need = j + reslen + len-i-1;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2091 if (need > outlen) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2092 /* overallocate, to avoid reallocations */
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2093 if (need<2*outlen)
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2094 need = 2*outlen;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2095 if (PyUnicode_Resize(&result, need)) {
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2096 Py_DECREF(item);
27675 8f8448fb58d6 PyUnicode_Resize() doesn't free its argument in case of a failure, Walter Dörwald <walter@livinglogic.de> parents: 27674 diff changeset	2097 goto Fail_1;
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2098 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2099 outlen = need;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2100 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2101 memcpy(
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2102 PyUnicode_AS_UNICODE(result) + j,
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2103 PyUnicode_AS_UNICODE(item),
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2104 reslen*sizeof(Py_UNICODE)
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2105 );
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2106 j += reslen;
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2107 }
ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2108 }
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2109 Py_DECREF(item);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2110 }
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2111
27674 ce3faab06de7 filterstring() and filterunicode() in Python/bltinmodule.c Walter Dörwald <walter@livinglogic.de> parents: 27652 diff changeset	2112 if (j < outlen)
27385 91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2113 PyUnicode_Resize(&result, j);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2114
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2115 return result;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2116
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2117 Fail_1:
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2118 Py_DECREF(result);
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2119 return NULL;
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2120 }
91a573243d5d Patch #636005: Filter unicode into unicode. Martin v. Löwis <martin@v.loewis.de> parents: 27076 diff changeset	2121 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/bltinmodule.c @ 28325:850626d47574 legacy-trunk