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

annotate Python/sysmodule.c @ 64474:56d4373cecb7 v3.2a2

Fix accidental suppression in r84537

author	Éric Araujo <merwok@netwok.org>
date	Sun, 05 Sep 2010 18:59:49 +0000
parents	944232521624
children	999d7d212f17

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* System module */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4 /*
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5 Various bits of information used by the interpreter are collected in
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6 module 'sys'.
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	7 Function member:
2586 ae131b8b4e31 fix comment about exit() Guido van Rossum <guido@python.org> parents: 2421 diff changeset	8 - exit(sts): raise SystemExit
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9 Data members:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10 - stdin, stdout, stderr: standard file objects
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	11 - modules: the table of modules (dictionary)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12 - path: module search path (list of strings)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	13 - argv: script arguments (list of strings)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	14 - ps1, ps2: optional primary and secondary prompts (strings)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	15 */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	16
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	17 #include "Python.h"
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	18 #include "structseq.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35673 diff changeset	19 #include "code.h"
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	20 #include "frameobject.h"
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	21 #include "eval.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	22
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	23 #include "osdefs.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	24
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	25 #ifdef MS_WINDOWS
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	26 #define WIN32_LEAN_AND_MEAN
43813 1561763cda72 No need to include windows.h twice Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43777 diff changeset	27 #include <windows.h>
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	28 #endif /* MS_WINDOWS */
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	29
4291 1427d61f1307 Rationalized MS ifdefs Guido van Rossum <guido@python.org> parents: 4256 diff changeset	30 #ifdef MS_COREDLL
3490 1dfc519ea3cb Under NT, define sys.dllhandle and sys.winver (Mark H.). Guido van Rossum <guido@python.org> parents: 3326 diff changeset	31 extern void *PyWin_DLLhModule;
6352 b62a7a59414e Get DLL version from a variable. Guido van Rossum <guido@python.org> parents: 5955 diff changeset	32 /* A string loaded from the DLL at startup: */
b62a7a59414e Get DLL version from a variable. Guido van Rossum <guido@python.org> parents: 5955 diff changeset	33 extern const char *PyWin_DLLVersionString;
3490 1dfc519ea3cb Under NT, define sys.dllhandle and sys.winver (Mark H.). Guido van Rossum <guido@python.org> parents: 3326 diff changeset	34 #endif
1dfc519ea3cb Under NT, define sys.dllhandle and sys.winver (Mark H.). Guido van Rossum <guido@python.org> parents: 3326 diff changeset	35
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	36 #ifdef __VMS
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	37 #include <unixlib.h>
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	38 #endif
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	39
29065 bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	40 #ifdef HAVE_LANGINFO_H
bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	41 #include <locale.h>
bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	42 #include <langinfo.h>
bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	43 #endif
bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	44
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	45 PyObject *
42812 a99ec4befda8 Add const to input string parameters Neal Norwitz <nnorwitz@gmail.com> parents: 42703 diff changeset	46 PySys_GetObject(const char *name)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	48 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	49 PyObject *sd = tstate->interp->sysdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	50 if (sd == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	51 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	52 return PyDict_GetItemString(sd, name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	55 int
42812 a99ec4befda8 Add const to input string parameters Neal Norwitz <nnorwitz@gmail.com> parents: 42703 diff changeset	56 PySys_SetObject(const char name, PyObject v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	57 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	58 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	59 PyObject *sd = tstate->interp->sysdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	60 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	61 if (PyDict_GetItemString(sd, name) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	62 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	63 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	64 return PyDict_DelItemString(sd, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	65 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	66 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	67 return PyDict_SetItemString(sd, name, v);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	68 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	69
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	70 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18805 diff changeset	71 sys_displayhook(PyObject self, PyObject o)
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	72 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	73 PyObject *outf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	74 PyInterpreterState *interp = PyThreadState_GET()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	75 PyObject *modules = interp->modules;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	76 PyObject *builtins = PyDict_GetItemString(modules, "builtins");
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	77
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	78 if (builtins == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	79 PyErr_SetString(PyExc_RuntimeError, "lost builtins module");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	80 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	81 }
18805 4462c57f6c94 Patch number #422106 by Greg Ball, to fix segmentation Moshe Zadka <moshez@math.huji.ac.il> parents: 18689 diff changeset	82
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	83 /* Print value except if None */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	84 /* After printing, also assign to '_' */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	85 /* Before, set '_' to None to avoid recursion */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	86 if (o == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	87 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	88 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	89 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	90 if (PyObject_SetAttrString(builtins, "_", Py_None) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	91 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	92 outf = PySys_GetObject("stdout");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	93 if (outf == NULL \|\| outf == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	94 PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	95 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	96 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	97 if (PyFile_WriteObject(o, outf, 0) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	98 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	99 if (PyFile_WriteString("\n", outf) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	100 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	101 if (PyObject_SetAttrString(builtins, "_", o) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	102 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	103 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	104 return Py_None;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	105 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	106
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	107 PyDoc_STRVAR(displayhook_doc,
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	108 "displayhook(object) -> None\n"
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	109 "\n"
59300 29fac4b1a51e Merged revisions 78620 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 58507 diff changeset	110 "Print an object to sys.stdout and also save it in builtins._\n"
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	111 );
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	112
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	113 static PyObject *
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	114 sys_excepthook(PyObject* self, PyObject* args)
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	115 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	116 PyObject exc, value, *tb;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	117 if (!PyArg_UnpackTuple(args, "excepthook", 3, 3, &exc, &value, &tb))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	118 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	119 PyErr_Display(exc, value, tb);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	120 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	121 return Py_None;
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	122 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	123
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	124 PyDoc_STRVAR(excepthook_doc,
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	125 "excepthook(exctype, value, traceback) -> None\n"
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	126 "\n"
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	127 "Handle an exception by displaying it with a traceback on sys.stderr.\n"
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	128 );
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	129
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	130 static PyObject *
28119 869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	131 sys_exc_info(PyObject self, PyObject noargs)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5377 diff changeset	132 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	133 PyThreadState *tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	134 tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	135 return Py_BuildValue(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	136 "(OOO)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	137 tstate->exc_type != NULL ? tstate->exc_type : Py_None,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	138 tstate->exc_value != NULL ? tstate->exc_value : Py_None,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	139 tstate->exc_traceback != NULL ?
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	140 tstate->exc_traceback : Py_None);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5377 diff changeset	141 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5377 diff changeset	142
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	143 PyDoc_STRVAR(exc_info_doc,
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	144 "exc_info() -> (type, value, traceback)\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	145 \n\
28119 869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	146 Return information about the most recent exception caught by an except\n\
869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	147 clause in the current stack frame or in an older stack frame."
869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	148 );
869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	149
869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	150 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	151 sys_exit(PyObject self, PyObject args)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	152 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	153 PyObject *exit_code = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	154 if (!PyArg_UnpackTuple(args, "exit", 0, 1, &exit_code))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	155 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	156 /* Raise SystemExit so callers may catch it or clean up. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	157 PyErr_SetObject(PyExc_SystemExit, exit_code);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	158 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	159 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	160
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	161 PyDoc_STRVAR(exit_doc,
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	162 "exit([status])\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	163 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	164 Exit the interpreter by raising SystemExit(status).\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	165 If the status is omitted or None, it defaults to zero (i.e., success).\n\
22531 ef314b37e260 backport nascheme's checkin of Michael W. Hudson <mwh@python.net> parents: 22119 diff changeset	166 If the status is numeric, it will be used as the system exit status.\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	167 If it is another kind of object, it will be printed and the system\n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	168 exit status will be one (i.e., failure)."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	169 );
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	170
20943 e4d380f5f297 Include sys_getdefaultencoding in #ifdef Py_USING_UNICODE. Fixes #479571. Martin v. Löwis <martin@v.loewis.de> parents: 20655 diff changeset	171
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	172 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18805 diff changeset	173 sys_getdefaultencoding(PyObject *self)
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	174 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	175 return PyUnicode_FromString(PyUnicode_GetDefaultEncoding());
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	176 }
c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	177
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	178 PyDoc_STRVAR(getdefaultencoding_doc,
12877 78231bbe605d Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12649 diff changeset	179 "getdefaultencoding() -> string\n\
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	180 \n\
c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	181 Return the current default string encoding used by the Unicode \n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	182 implementation."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	183 );
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	184
c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	185 static PyObject *
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	186 sys_getfilesystemencoding(PyObject *self)
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	187 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	188 if (Py_FileSystemDefaultEncoding)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	189 return PyUnicode_FromString(Py_FileSystemDefaultEncoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	190 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	191 return Py_None;
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	192 }
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	193
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	194 PyDoc_STRVAR(getfilesystemencoding_doc,
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	195 "getfilesystemencoding() -> string\n\
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	196 \n\
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	197 Return the encoding used to convert Unicode filenames in\n\
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	198 operating system filenames."
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	199 );
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	200
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	201 static PyObject *
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	202 sys_setfilesystemencoding(PyObject self, PyObject args)
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	203 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	204 PyObject *new_encoding;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	205 if (!PyArg_ParseTuple(args, "U:setfilesystemencoding", &new_encoding))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	206 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	207 if (_Py_SetFileSystemEncoding(new_encoding))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	208 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	209 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	210 return Py_None;
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	211 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	212
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	213 PyDoc_STRVAR(setfilesystemencoding_doc,
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	214 "setfilesystemencoding(string) -> None\n\
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	215 \n\
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	216 Set the encoding used to convert Unicode filenames in\n\
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	217 operating system filenames."
e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	218 );
40484 8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	219
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	220 static PyObject *
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	221 sys_intern(PyObject self, PyObject args)
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	222 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	223 PyObject *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	224 if (!PyArg_ParseTuple(args, "U:intern", &s))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	225 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	226 if (PyUnicode_CheckExact(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	227 Py_INCREF(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	228 PyUnicode_InternInPlace(&s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	229 return s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	230 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	231 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	232 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	233 "can't intern %.400s", s->ob_type->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	234 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	235 }
40484 8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	236 }
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	237
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	238 PyDoc_STRVAR(intern_doc,
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	239 "intern(string) -> string\n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	240 \n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	241 ``Intern'' the given string. This enters the string in the (global)\n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	242 table of interned strings whose purpose is to speed up dictionary lookups.\n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	243 Return the string itself or the previously interned string object with the\n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	244 same value.");
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	245
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	246
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	247 /*
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	248 * Cached interned string objects used for calling the profile and
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	249 * trace functions. Initialized by trace_init().
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	250 */
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 30108 diff changeset	251 static PyObject *whatstrings[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	252
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	253 static int
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	254 trace_init(void)
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	255 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	256 static char *whatnames[7] = {"call", "exception", "line", "return",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	257 "c_call", "c_exception", "c_return"};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	258 PyObject *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	259 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	260 for (i = 0; i < 7; ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	261 if (whatstrings[i] == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	262 name = PyUnicode_InternFromString(whatnames[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	263 if (name == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	264 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	265 whatstrings[i] = name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	266 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	267 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	268 return 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	269 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	270
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	271
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	272 static PyObject *
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	273 call_trampoline(PyThreadState tstate, PyObject callback,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	274 PyFrameObject frame, int what, PyObject arg)
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	275 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	276 PyObject *args = PyTuple_New(3);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	277 PyObject *whatstr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	278 PyObject *result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	279
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	280 if (args == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	281 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	282 Py_INCREF(frame);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	283 whatstr = whatstrings[what];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	284 Py_INCREF(whatstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	285 if (arg == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	286 arg = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	287 Py_INCREF(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	288 PyTuple_SET_ITEM(args, 0, (PyObject *)frame);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	289 PyTuple_SET_ITEM(args, 1, whatstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	290 PyTuple_SET_ITEM(args, 2, arg);
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	291
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	292 /* call the Python-level function */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	293 PyFrame_FastToLocals(frame);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	294 result = PyEval_CallObject(callback, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	295 PyFrame_LocalsToFast(frame, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	296 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	297 PyTraceBack_Here(frame);
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	298
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	299 /* cleanup */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	300 Py_DECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	301 return result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	302 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	303
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	304 static int
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	305 profile_trampoline(PyObject self, PyFrameObject frame,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	306 int what, PyObject *arg)
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	307 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	308 PyThreadState *tstate = frame->f_tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	309 PyObject *result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	310
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	311 if (arg == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	312 arg = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	313 result = call_trampoline(tstate, self, frame, what, arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	314 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	315 PyEval_SetProfile(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	316 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	317 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	318 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	319 return 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	320 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	321
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	322 static int
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	323 trace_trampoline(PyObject self, PyFrameObject frame,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	324 int what, PyObject *arg)
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	325 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	326 PyThreadState *tstate = frame->f_tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	327 PyObject *callback;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	328 PyObject *result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	329
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	330 if (what == PyTrace_CALL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	331 callback = self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	332 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	333 callback = frame->f_trace;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	334 if (callback == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	335 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	336 result = call_trampoline(tstate, callback, frame, what, arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	337 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	338 PyEval_SetTrace(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	339 Py_XDECREF(frame->f_trace);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	340 frame->f_trace = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	341 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	342 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	343 if (result != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	344 PyObject *temp = frame->f_trace;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	345 frame->f_trace = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	346 Py_XDECREF(temp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	347 frame->f_trace = result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	348 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	349 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	350 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	351 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	352 return 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	353 }
18136 4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 17396 diff changeset	354
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	355 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	356 sys_settrace(PyObject self, PyObject args)
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	357 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	358 if (trace_init() == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	359 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	360 if (args == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	361 PyEval_SetTrace(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	362 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	363 PyEval_SetTrace(trace_trampoline, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	364 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	365 return Py_None;
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	366 }
bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	367
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	368 PyDoc_STRVAR(settrace_doc,
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	369 "settrace(function)\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	370 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	371 Set the global debug tracing function. It will be called on each\n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	372 function call. See the debugger chapter in the library manual."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	373 );
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	374
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	375 static PyObject *
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	376 sys_gettrace(PyObject self, PyObject args)
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	377 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	378 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	379 PyObject *temp = tstate->c_traceobj;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	380
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	381 if (temp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	382 temp = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	383 Py_INCREF(temp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	384 return temp;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	385 }
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	386
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	387 PyDoc_STRVAR(gettrace_doc,
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	388 "gettrace()\n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	389 \n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	390 Return the global debug tracing function set with sys.settrace.\n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	391 See the debugger chapter in the library manual."
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	392 );
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	393
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	394 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	395 sys_setprofile(PyObject self, PyObject args)
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	396 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	397 if (trace_init() == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	398 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	399 if (args == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	400 PyEval_SetProfile(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	401 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	402 PyEval_SetProfile(profile_trampoline, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	403 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	404 return Py_None;
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	405 }
bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	406
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	407 PyDoc_STRVAR(setprofile_doc,
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	408 "setprofile(function)\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	409 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	410 Set the profiling function. It will be called on each function call\n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	411 and return. See the profiler chapter in the library manual."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	412 );
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	413
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	414 static PyObject *
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	415 sys_getprofile(PyObject self, PyObject args)
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	416 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	417 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	418 PyObject *temp = tstate->c_profileobj;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	419
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	420 if (temp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	421 temp = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	422 Py_INCREF(temp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	423 return temp;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	424 }
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	425
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	426 PyDoc_STRVAR(getprofile_doc,
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	427 "getprofile()\n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	428 \n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	429 Return the profiling function set with sys.setprofile.\n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	430 See the profiler chapter in the library manual."
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	431 );
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	432
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	433 static int _check_interval = 100;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	434
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	435 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	436 sys_setcheckinterval(PyObject self, PyObject args)
2093 e8cafb2b743a sys.check_interval=x -> sys.setcheckinterval(x) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	437 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	438 if (PyErr_WarnEx(PyExc_DeprecationWarning,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	439 "sys.getcheckinterval() and sys.setcheckinterval() "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	440 "are deprecated. Use sys.setswitchinterval() "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	441 "instead.", 1) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	442 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	443 if (!PyArg_ParseTuple(args, "i:setcheckinterval", &_check_interval))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	444 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	445 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	446 return Py_None;
2093 e8cafb2b743a sys.check_interval=x -> sys.setcheckinterval(x) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	447 }
e8cafb2b743a sys.check_interval=x -> sys.setcheckinterval(x) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	448
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	449 PyDoc_STRVAR(setcheckinterval_doc,
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	450 "setcheckinterval(n)\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	451 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	452 Tell the Python interpreter to check for asynchronous events every\n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	453 n instructions. This also affects how often thread switches occur."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	454 );
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	455
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	456 static PyObject *
29765 e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	457 sys_getcheckinterval(PyObject self, PyObject args)
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	458 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	459 if (PyErr_WarnEx(PyExc_DeprecationWarning,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	460 "sys.getcheckinterval() and sys.setcheckinterval() "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	461 "are deprecated. Use sys.getswitchinterval() "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	462 "instead.", 1) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	463 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	464 return PyLong_FromLong(_check_interval);
29765 e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	465 }
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	466
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	467 PyDoc_STRVAR(getcheckinterval_doc,
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	468 "getcheckinterval() -> current check interval; see setcheckinterval()."
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	469 );
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	470
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	471 #ifdef WITH_THREAD
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	472 static PyObject *
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	473 sys_setswitchinterval(PyObject self, PyObject args)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	474 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	475 double d;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	476 if (!PyArg_ParseTuple(args, "d:setswitchinterval", &d))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	477 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	478 if (d <= 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	479 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	480 "switch interval must be strictly positive");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	481 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	482 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	483 _PyEval_SetSwitchInterval((unsigned long) (1e6 * d));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	484 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	485 return Py_None;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	486 }
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	487
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	488 PyDoc_STRVAR(setswitchinterval_doc,
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	489 "setswitchinterval(n)\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	490 \n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	491 Set the ideal thread switching delay inside the Python interpreter\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	492 The actual frequency of switching threads can be lower if the\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	493 interpreter executes long sequences of uninterruptible code\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	494 (this is implementation-specific and workload-dependent).\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	495 \n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	496 The parameter must represent the desired switching delay in seconds\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	497 A typical value is 0.005 (5 milliseconds)."
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	498 );
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	499
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	500 static PyObject *
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	501 sys_getswitchinterval(PyObject self, PyObject args)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	502 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	503 return PyFloat_FromDouble(1e-6 * _PyEval_GetSwitchInterval());
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	504 }
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	505
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	506 PyDoc_STRVAR(getswitchinterval_doc,
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	507 "getswitchinterval() -> current thread switch interval; see setswitchinterval()."
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	508 );
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	509
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	510 #endif /* WITH_THREAD */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	511
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	512 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	513 static PyObject *
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	514 sys_settscdump(PyObject self, PyObject args)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	515 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	516 int bool;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	517 PyThreadState *tstate = PyThreadState_Get();
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	518
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	519 if (!PyArg_ParseTuple(args, "i:settscdump", &bool))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	520 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	521 if (bool)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	522 tstate->interp->tscdump = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	523 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	524 tstate->interp->tscdump = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	525 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	526 return Py_None;
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	527
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	528 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	529
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	530 PyDoc_STRVAR(settscdump_doc,
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	531 "settscdump(bool)\n\
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	532 \n\
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	533 If true, tell the Python interpreter to dump VM measurements to\n\
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	534 stderr. If false, turn off dump. The measurements are based on the\n\
33104 f455bbe7ea7e This is my patch: Michael W. Hudson <mwh@python.net> parents: 32344 diff changeset	535 processor's time-stamp counter."
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	536 );
32344 748129e6e108 Remove compiler warning Neal Norwitz <nnorwitz@gmail.com> parents: 32301 diff changeset	537 #endif /* TSC */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	538
29765 e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	539 static PyObject *
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	540 sys_setrecursionlimit(PyObject self, PyObject args)
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	541 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	542 int new_limit;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	543 if (!PyArg_ParseTuple(args, "i:setrecursionlimit", &new_limit))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	544 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	545 if (new_limit <= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	546 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	547 "recursion limit must be positive");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	548 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	549 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	550 Py_SetRecursionLimit(new_limit);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	551 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	552 return Py_None;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	553 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	554
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	555 static PyTypeObject Hash_InfoType;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	556
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	557 PyDoc_STRVAR(hash_info_doc,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	558 "hash_info\n\
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	559 \n\
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	560 A struct sequence providing parameters used for computing\n\
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	561 numeric hashes. The attributes are read only.");
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	562
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	563 static PyStructSequence_Field hash_info_fields[] = {
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	564 {"width", "width of the type used for hashing, in bits"},
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	565 {"modulus", "prime number giving the modulus on which the hash "
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	566 "function is based"},
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	567 {"inf", "value to be used for hash of a positive infinity"},
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	568 {"nan", "value to be used for hash of a nan"},
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	569 {"imag", "multiplier used for the imaginary part of a complex number"},
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	570 {NULL, NULL}
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	571 };
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	572
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	573 static PyStructSequence_Desc hash_info_desc = {
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	574 "sys.hash_info",
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	575 hash_info_doc,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	576 hash_info_fields,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	577 5,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	578 };
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	579
62828 1f37d082a9aa - sysmodule.c (get_hash_info): Define as static function. Matthias Klose <doko@ubuntu.com> parents: 62189 diff changeset	580 static PyObject *
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	581 get_hash_info(void)
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	582 {
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	583 PyObject *hash_info;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	584 int field = 0;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	585 hash_info = PyStructSequence_New(&Hash_InfoType);
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	586 if (hash_info == NULL)
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	587 return NULL;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	588 PyStructSequence_SET_ITEM(hash_info, field++,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	589 PyLong_FromLong(8*sizeof(long)));
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	590 PyStructSequence_SET_ITEM(hash_info, field++,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	591 PyLong_FromLong(_PyHASH_MODULUS));
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	592 PyStructSequence_SET_ITEM(hash_info, field++,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	593 PyLong_FromLong(_PyHASH_INF));
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	594 PyStructSequence_SET_ITEM(hash_info, field++,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	595 PyLong_FromLong(_PyHASH_NAN));
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	596 PyStructSequence_SET_ITEM(hash_info, field++,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	597 PyLong_FromLong(_PyHASH_IMAG));
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	598 if (PyErr_Occurred()) {
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	599 Py_CLEAR(hash_info);
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	600 return NULL;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	601 }
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	602 return hash_info;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	603 }
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	604
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	605
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	606 PyDoc_STRVAR(setrecursionlimit_doc,
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	607 "setrecursionlimit(n)\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	608 \n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	609 Set the maximum depth of the Python interpreter stack to n. This\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	610 limit prevents infinite recursion from causing an overflow of the C\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	611 stack and crashing Python. The highest possible limit is platform-\n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	612 dependent."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	613 );
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	614
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	615 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18805 diff changeset	616 sys_getrecursionlimit(PyObject *self)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	617 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	618 return PyLong_FromLong(Py_GetRecursionLimit());
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	619 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	620
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	621 PyDoc_STRVAR(getrecursionlimit_doc,
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	622 "getrecursionlimit()\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	623 \n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	624 Return the current value of the recursion limit, the maximum depth\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	625 of the Python interpreter stack. This limit prevents infinite\n\
24013 71f13cf4f9e2 Got rid of an extraneous semicolon. Jack Jansen <jack.jansen@cwi.nl> parents: 23947 diff changeset	626 recursion from causing an overflow of the C stack and crashing Python."
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	627 );
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	628
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	629 #ifdef MS_WINDOWS
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	630 PyDoc_STRVAR(getwindowsversion_doc,
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	631 "getwindowsversion()\n\
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	632 \n\
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	633 Return information about the running version of Windows as a named tuple.\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	634 The members are named: major, minor, build, platform, service_pack,\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	635 service_pack_major, service_pack_minor, suite_mask, and product_type. For\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	636 backward compatibiliy, only the first 5 items are available by indexing.\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	637 All elements are numbers, except service_pack which is a string. Platform\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	638 may be 0 for win32s, 1 for Windows 9x/ME, 2 for Windows NT/2000/XP/Vista/7,\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	639 3 for Windows CE. Product_type may be 1 for a workstation, 2 for a domain\n\
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	640 controller, 3 for a server."
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	641 );
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	642
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	643 static PyTypeObject WindowsVersionType = {0, 0, 0, 0, 0, 0};
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	644
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	645 static PyStructSequence_Field windows_version_fields[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	646 {"major", "Major version number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	647 {"minor", "Minor version number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	648 {"build", "Build number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	649 {"platform", "Operating system platform"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	650 {"service_pack", "Latest Service Pack installed on the system"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	651 {"service_pack_major", "Service Pack major version number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	652 {"service_pack_minor", "Service Pack minor version number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	653 {"suite_mask", "Bit mask identifying available product suites"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	654 {"product_type", "System product type"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	655 {0}
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	656 };
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	657
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	658 static PyStructSequence_Desc windows_version_desc = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	659 "sys.getwindowsversion", /* name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	660 getwindowsversion_doc, /* doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	661 windows_version_fields, /* fields */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	662 5 /* For backward compatibility,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	663 only the first 5 items are accessible
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	664 via indexing, the rest are name only */
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	665 };
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	666
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	667 static PyObject *
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	668 sys_getwindowsversion(PyObject *self)
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	669 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	670 PyObject *version;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	671 int pos = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	672 OSVERSIONINFOEX ver;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	673 ver.dwOSVersionInfoSize = sizeof(ver);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	674 if (!GetVersionEx((OSVERSIONINFO*) &ver))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	675 return PyErr_SetFromWindowsErr(0);
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	676
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	677 version = PyStructSequence_New(&WindowsVersionType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	678 if (version == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	679 return NULL;
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	680
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	681 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwMajorVersion));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	682 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwMinorVersion));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	683 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwBuildNumber));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	684 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwPlatformId));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	685 PyStructSequence_SET_ITEM(version, pos++, PyUnicode_FromString(ver.szCSDVersion));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	686 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wServicePackMajor));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	687 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wServicePackMinor));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	688 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wSuiteMask));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	689 PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wProductType));
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	690
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	691 return version;
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	692 }
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	693
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	694 #endif /* MS_WINDOWS */
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	695
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	696 #ifdef HAVE_DLOPEN
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	697 static PyObject *
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	698 sys_setdlopenflags(PyObject self, PyObject args)
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	699 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	700 int new_val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	701 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	702 if (!PyArg_ParseTuple(args, "i:setdlopenflags", &new_val))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	703 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	704 if (!tstate)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	705 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	706 tstate->interp->dlopenflags = new_val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	707 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	708 return Py_None;
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	709 }
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	710
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	711 PyDoc_STRVAR(setdlopenflags_doc,
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	712 "setdlopenflags(n) -> None\n\
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	713 \n\
55611 4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	714 Set the flags used by the interpreter for dlopen calls, such as when the\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	715 interpreter loads extension modules. Among other things, this will enable\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	716 a lazy resolving of symbols when importing a module, if called as\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	717 sys.setdlopenflags(0). To share symbols across extension modules, call as\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	718 sys.setdlopenflags(ctypes.RTLD_GLOBAL). Symbolic names for the flag modules\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	719 can be either found in the ctypes module, or in the DLFCN module. If DLFCN\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	720 is not available, it can be generated from /usr/include/dlfcn.h using the\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	721 h2py script.");
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	722
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	723 static PyObject *
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	724 sys_getdlopenflags(PyObject self, PyObject args)
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	725 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	726 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	727 if (!tstate)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	728 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	729 return PyLong_FromLong(tstate->interp->dlopenflags);
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	730 }
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	731
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	732 PyDoc_STRVAR(getdlopenflags_doc,
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	733 "getdlopenflags() -> int\n\
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	734 \n\
55611 4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	735 Return the current value of the flags that are used for dlopen calls.\n\
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	736 The flag constants are defined in the ctypes and DLFCN modules.");
4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	737
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	738 #endif /* HAVE_DLOPEN */
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	739
1013 a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	740 #ifdef USE_MALLOPT
a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	741 /* Link with -lmalloc (or -lmpc) on an SGI */
a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	742 #include <malloc.h>
a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	743
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	744 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	745 sys_mdebug(PyObject self, PyObject args)
1013 a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	746 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	747 int flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	748 if (!PyArg_ParseTuple(args, "i:mdebug", &flag))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	749 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	750 mallopt(M_DEBUG, flag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	751 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	752 return Py_None;
1013 a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	753 }
a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	754 #endif /* USE_MALLOPT */
a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	755
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	756 static PyObject *
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	757 sys_getsizeof(PyObject self, PyObject args, PyObject *kwds)
47466 58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	758 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	759 PyObject *res = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	760 static PyObject str__sizeof__ = NULL, gc_head_size = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	761 static char *kwlist[] = {"object", "default", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	762 PyObject o, dflt = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	763 PyObject *method;
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	764
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	765 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O:getsizeof",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	766 kwlist, &o, &dflt))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	767 return NULL;
47466 58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	768
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	769 /* Initialize static variable for GC head size */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	770 if (gc_head_size == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	771 gc_head_size = PyLong_FromSsize_t(sizeof(PyGC_Head));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	772 if (gc_head_size == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	773 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	774 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	775
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	776 /* Make sure the type is initialized. float gets initialized late */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	777 if (PyType_Ready(Py_TYPE(o)) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	778 return NULL;
53954 1b15a57e1f02 Merged revisions 72508 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53185 diff changeset	779
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	780 method = _PyObject_LookupSpecial(o, "__sizeof__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	781 &str__sizeof__);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	782 if (method == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	783 if (!PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	784 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	785 "Type %.100s doesn't define __sizeof__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	786 Py_TYPE(o)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	787 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	788 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	789 res = PyObject_CallFunctionObjArgs(method, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	790 Py_DECREF(method);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	791 }
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	792
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	793 /* Has a default value been given */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	794 if ((res == NULL) && (dflt != NULL) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	795 PyErr_ExceptionMatches(PyExc_TypeError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	796 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	797 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	798 Py_INCREF(dflt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	799 return dflt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	800 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	801 else if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	802 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	803
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	804 /* add gc_head size */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	805 if (PyObject_IS_GC(o)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	806 PyObject *tmp = res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	807 res = PyNumber_Add(tmp, gc_head_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	808 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	809 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	810 return res;
47466 58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	811 }
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	812
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	813 PyDoc_STRVAR(getsizeof_doc,
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	814 "getsizeof(object, default) -> int\n\
47466 58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	815 \n\
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	816 Return the size of object in bytes.");
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	817
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	818 static PyObject *
20655 7344687bf2c0 Convert getrefcount() to METH_O, and sys_excepthook() to use Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	819 sys_getrefcount(PyObject self, PyObject arg)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	820 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	821 return PyLong_FromSsize_t(arg->ob_refcnt);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	822 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	823
24126 fdf80e04e4bb Rearranged and added comments to object.h, to clarify many things Tim Peters <tim.peters@gmail.com> parents: 24071 diff changeset	824 #ifdef Py_REF_DEBUG
12965 04c89d77dfdb Added a new debug method sys.gettotalrefcount(), which returns the total number of references on all Python objects. This is only enabled when Py_TRACE_REFS is defined (which includes default debug builds under Windows). Mark Hammond <mhammond@skippinet.com.au> parents: 12877 diff changeset	825 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18805 diff changeset	826 sys_gettotalrefcount(PyObject *self)
12965 04c89d77dfdb Added a new debug method sys.gettotalrefcount(), which returns the total number of references on all Python objects. This is only enabled when Py_TRACE_REFS is defined (which includes default debug builds under Windows). Mark Hammond <mhammond@skippinet.com.au> parents: 12877 diff changeset	827 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	828 return PyLong_FromSsize_t(_Py_GetRefTotal());
12965 04c89d77dfdb Added a new debug method sys.gettotalrefcount(), which returns the total number of references on all Python objects. This is only enabled when Py_TRACE_REFS is defined (which includes default debug builds under Windows). Mark Hammond <mhammond@skippinet.com.au> parents: 12877 diff changeset	829 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	830 #endif /* Py_REF_DEBUG */
12965 04c89d77dfdb Added a new debug method sys.gettotalrefcount(), which returns the total number of references on all Python objects. This is only enabled when Py_TRACE_REFS is defined (which includes default debug builds under Windows). Mark Hammond <mhammond@skippinet.com.au> parents: 12877 diff changeset	831
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	832 PyDoc_STRVAR(getrefcount_doc,
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	833 "getrefcount(object) -> integer\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	834 \n\
23947 37118b6e5f46 Fix the docstring for sys.getrefcount(). Fred Drake <fdrake@acm.org> parents: 23746 diff changeset	835 Return the reference count of object. The count returned is generally\n\
37118b6e5f46 Fix the docstring for sys.getrefcount(). Fred Drake <fdrake@acm.org> parents: 23746 diff changeset	836 one higher than you might expect, because it includes the (temporary)\n\
37118b6e5f46 Fix the docstring for sys.getrefcount(). Fred Drake <fdrake@acm.org> parents: 23746 diff changeset	837 reference as an argument to getrefcount()."
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	838 );
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	839
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	840 #ifdef COUNT_ALLOCS
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	841 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18805 diff changeset	842 sys_getcounts(PyObject *self)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	843 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	844 extern PyObject *get_counts(void);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	845
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	846 return get_counts();
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	847 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	848 #endif
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	849
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	850 PyDoc_STRVAR(getframe_doc,
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	851 "_getframe([depth]) -> frameobject\n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	852 \n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	853 Return a frame object from the call stack. If optional integer depth is\n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	854 given, return the frame object that many calls below the top of the stack.\n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	855 If that is deeper than the call stack, ValueError is raised. The default\n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	856 for depth is zero, returning the frame at the top of the call stack.\n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	857 \n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	858 This function should be used for internal and specialized\n\
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	859 purposes only."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	860 );
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	861
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	862 static PyObject *
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	863 sys_getframe(PyObject self, PyObject args)
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	864 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	865 PyFrameObject *f = PyThreadState_GET()->frame;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	866 int depth = -1;
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	867
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	868 if (!PyArg_ParseTuple(args, "\|i:_getframe", &depth))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	869 return NULL;
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	870
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	871 while (depth > 0 && f != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	872 f = f->f_back;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	873 --depth;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	874 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	875 if (f == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	876 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	877 "call stack is not deep enough");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	878 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	879 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	880 Py_INCREF(f);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	881 return (PyObject*)f;
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	882 }
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	883
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	884 PyDoc_STRVAR(current_frames_doc,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	885 "_current_frames() -> dictionary\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	886 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	887 Return a dictionary mapping each current thread T's thread id to T's\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	888 current stack frame.\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	889 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	890 This function should be used for specialized purposes only."
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	891 );
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	892
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	893 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	894 sys_current_frames(PyObject self, PyObject noargs)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	895 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	896 return _PyThread_CurrentFrames();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	897 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	898
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	899 PyDoc_STRVAR(call_tracing_doc,
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	900 "call_tracing(func, args) -> object\n\
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	901 \n\
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	902 Call func(*args), while tracing is enabled. The tracing state is\n\
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	903 saved, and restored afterwards. This is intended to be called from\n\
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	904 a debugger from a checkpoint, to recursively debug some other code."
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	905 );
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	906
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	907 static PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	908 sys_call_tracing(PyObject self, PyObject args)
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	909 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	910 PyObject func, funcargs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	911 if (!PyArg_ParseTuple(args, "OO!:call_tracing", &func, &PyTuple_Type, &funcargs))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	912 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	913 return _PyEval_CallTracing(func, funcargs);
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	914 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	915
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	916 PyDoc_STRVAR(callstats_doc,
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	917 "callstats() -> tuple of integers\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	918 \n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	919 Return a tuple of function call statistics, if CALL_PROFILE was defined\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	920 when Python was built. Otherwise, return None.\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	921 \n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	922 When enabled, this function returns detailed, implementation-specific\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	923 details about the number of function calls executed. The return value is\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	924 a 11-tuple where the entries in the tuple are counts of:\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	925 0. all function calls\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	926 1. calls to PyFunction_Type objects\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	927 2. PyFunction calls that do not create an argument tuple\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	928 3. PyFunction calls that do not create an argument tuple\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	929 and bypass PyEval_EvalCodeEx()\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	930 4. PyMethod calls\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	931 5. PyMethod calls on bound methods\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	932 6. PyType calls\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	933 7. PyCFunction calls\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	934 8. generator calls\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	935 9. All other calls\n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	936 10. Number of stack pops performed by call_function()"
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	937 );
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	938
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	939 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	940 extern "C" {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	941 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	942
3585 4ed09a3c3201 TRACE_REFS -> Py_TRACE_REFS Guido van Rossum <guido@python.org> parents: 3490 diff changeset	943 #ifdef Py_TRACE_REFS
3609 0b0c4ed1936a rename printrefs, getobjects to _Py_ prefix Guido van Rossum <guido@python.org> parents: 3585 diff changeset	944 /* Defined in objects.c because it uses static globals if that file */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	945 extern PyObject _Py_GetObjects(PyObject , PyObject *);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	946 #endif
3609 0b0c4ed1936a rename printrefs, getobjects to _Py_ prefix Guido van Rossum <guido@python.org> parents: 3585 diff changeset	947
5047 7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	948 #ifdef DYNAMIC_EXECUTION_PROFILE
7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	949 /* Defined in ceval.c because it uses static globals if that file */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	950 extern PyObject _Py_GetDXProfile(PyObject , PyObject *);
5047 7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	951 #endif
7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	952
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	953 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	954 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	955 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	956
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	957 static PyObject *
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	958 sys_clear_type_cache(PyObject* self, PyObject* args)
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	959 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	960 PyType_ClearCache();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	961 Py_RETURN_NONE;
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	962 }
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	963
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	964 PyDoc_STRVAR(sys_clear_type_cache__doc__,
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	965 "_clear_type_cache() -> None\n\
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	966 Clear the internal type lookup cache.");
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	967
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	968
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	969 static PyMethodDef sys_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	970 /* Might as well keep this in alphabetic order */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	971 {"callstats", (PyCFunction)PyEval_GetCallStats, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	972 callstats_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	973 {"_clear_type_cache", sys_clear_type_cache, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	974 sys_clear_type_cache__doc__},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	975 {"_current_frames", sys_current_frames, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	976 current_frames_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	977 {"displayhook", sys_displayhook, METH_O, displayhook_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	978 {"exc_info", sys_exc_info, METH_NOARGS, exc_info_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	979 {"excepthook", sys_excepthook, METH_VARARGS, excepthook_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	980 {"exit", sys_exit, METH_VARARGS, exit_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	981 {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	982 METH_NOARGS, getdefaultencoding_doc},
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	983 #ifdef HAVE_DLOPEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	984 {"getdlopenflags", (PyCFunction)sys_getdlopenflags, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	985 getdlopenflags_doc},
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	986 #endif
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	987 #ifdef COUNT_ALLOCS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	988 {"getcounts", (PyCFunction)sys_getcounts, METH_NOARGS},
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	989 #endif
5047 7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	990 #ifdef DYNAMIC_EXECUTION_PROFILE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	991 {"getdxp", _Py_GetDXProfile, METH_VARARGS},
5047 7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	992 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	993 {"getfilesystemencoding", (PyCFunction)sys_getfilesystemencoding,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	994 METH_NOARGS, getfilesystemencoding_doc},
3585 4ed09a3c3201 TRACE_REFS -> Py_TRACE_REFS Guido van Rossum <guido@python.org> parents: 3490 diff changeset	995 #ifdef Py_TRACE_REFS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	996 {"getobjects", _Py_GetObjects, METH_VARARGS},
24126 fdf80e04e4bb Rearranged and added comments to object.h, to clarify many things Tim Peters <tim.peters@gmail.com> parents: 24071 diff changeset	997 #endif
fdf80e04e4bb Rearranged and added comments to object.h, to clarify many things Tim Peters <tim.peters@gmail.com> parents: 24071 diff changeset	998 #ifdef Py_REF_DEBUG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	999 {"gettotalrefcount", (PyCFunction)sys_gettotalrefcount, METH_NOARGS},
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	1000 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1001 {"getrefcount", (PyCFunction)sys_getrefcount, METH_O, getrefcount_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1002 {"getrecursionlimit", (PyCFunction)sys_getrecursionlimit, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1003 getrecursionlimit_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1004 {"getsizeof", (PyCFunction)sys_getsizeof,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1005 METH_VARARGS \| METH_KEYWORDS, getsizeof_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1006 {"_getframe", sys_getframe, METH_VARARGS, getframe_doc},
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	1007 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1008 {"getwindowsversion", (PyCFunction)sys_getwindowsversion, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1009 getwindowsversion_doc},
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	1010 #endif /* MS_WINDOWS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1011 {"intern", sys_intern, METH_VARARGS, intern_doc},
1013 a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	1012 #ifdef USE_MALLOPT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1013 {"mdebug", sys_mdebug, METH_VARARGS},
1013 a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	1014 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1015 {"setfilesystemencoding", sys_setfilesystemencoding, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1016 setfilesystemencoding_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1017 {"setcheckinterval", sys_setcheckinterval, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1018 setcheckinterval_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1019 {"getcheckinterval", sys_getcheckinterval, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1020 getcheckinterval_doc},
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	1021 #ifdef WITH_THREAD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1022 {"setswitchinterval", sys_setswitchinterval, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1023 setswitchinterval_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1024 {"getswitchinterval", sys_getswitchinterval, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1025 getswitchinterval_doc},
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	1026 #endif
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	1027 #ifdef HAVE_DLOPEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1028 {"setdlopenflags", sys_setdlopenflags, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1029 setdlopenflags_doc},
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	1030 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1031 {"setprofile", sys_setprofile, METH_O, setprofile_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1032 {"getprofile", sys_getprofile, METH_NOARGS, getprofile_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1033 {"setrecursionlimit", sys_setrecursionlimit, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1034 setrecursionlimit_doc},
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	1035 #ifdef WITH_TSC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1036 {"settscdump", sys_settscdump, METH_VARARGS, settscdump_doc},
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	1037 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1038 {"settrace", sys_settrace, METH_O, settrace_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1039 {"gettrace", sys_gettrace, METH_NOARGS, gettrace_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1040 {"call_tracing", sys_call_tracing, METH_VARARGS, call_tracing_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1041 {NULL, NULL} /* sentinel */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1042 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1043
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	1044 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1045 list_builtin_module_names(void)
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1046 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1047 PyObject *list = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1048 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1049 if (list == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1050 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1051 for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1052 PyObject *name = PyUnicode_FromString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1053 PyImport_Inittab[i].name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1054 if (name == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1055 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1056 PyList_Append(list, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1057 Py_DECREF(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1058 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1059 if (PyList_Sort(list) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1060 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1061 list = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1062 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1063 if (list) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1064 PyObject *v = PyList_AsTuple(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1065 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1066 list = v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1067 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1068 return list;
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1069 }
2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1070
15595 0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1071 static PyObject *warnoptions = NULL;
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1072
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1073 void
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1074 PySys_ResetWarnOptions(void)
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1075 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1076 if (warnoptions == NULL \|\| !PyList_Check(warnoptions))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1077 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1078 PyList_SetSlice(warnoptions, 0, PyList_GET_SIZE(warnoptions), NULL);
15595 0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1079 }
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1080
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1081 void
61751 b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1082 PySys_AddWarnOptionUnicode(PyObject *unicode)
15595 0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1083 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1084 if (warnoptions == NULL \|\| !PyList_Check(warnoptions)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1085 Py_XDECREF(warnoptions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1086 warnoptions = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1087 if (warnoptions == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1088 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1089 }
61751 b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1090 PyList_Append(warnoptions, unicode);
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1091 }
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1092
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1093 void
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1094 PySys_AddWarnOption(const wchar_t *s)
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1095 {
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1096 PyObject *unicode;
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1097 unicode = PyUnicode_FromWideChar(s, -1);
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1098 if (unicode == NULL)
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1099 return;
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1100 PySys_AddWarnOptionUnicode(unicode);
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1101 Py_DECREF(unicode);
15595 0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1102 }
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1103
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1104 int
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1105 PySys_HasWarnOptions(void)
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1106 {
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1107 return (warnoptions != NULL && (PyList_Size(warnoptions) > 0)) ? 1 : 0;
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1108 }
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1109
8840 44baef8ab5c8 Gack. The module doc string is too long for VC++ 5.0. Guido van Rossum <guido@python.org> parents: 8566 diff changeset	1110 /* XXX This doc string is too long to be a single string literal in VC++ 5.0.
44baef8ab5c8 Gack. The module doc string is too long for VC++ 5.0. Guido van Rossum <guido@python.org> parents: 8566 diff changeset	1111 Two literals concatenated works just fine. If you have a K&R compiler
44baef8ab5c8 Gack. The module doc string is too long for VC++ 5.0. Guido van Rossum <guido@python.org> parents: 8566 diff changeset	1112 or other abomination that however does understand longer strings,
44baef8ab5c8 Gack. The module doc string is too long for VC++ 5.0. Guido van Rossum <guido@python.org> parents: 8566 diff changeset	1113 get rid of the !!! comment in the middle and the quotes that surround it. */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1114 PyDoc_VAR(sys_doc) =
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1115 PyDoc_STR(
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1116 "This module provides access to some objects used or maintained by the\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1117 interpreter and to functions that interact strongly with the interpreter.\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1118 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1119 Dynamic objects:\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1120 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1121 argv -- command line arguments; argv[0] is the script pathname if known\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1122 path -- module search path; path[0] is the script directory, else ''\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1123 modules -- dictionary of loaded modules\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1124 \n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1125 displayhook -- called to show results in an interactive session\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1126 excepthook -- called to handle any uncaught exception other than SystemExit\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1127 To customize printing in an interactive session or to install a custom\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1128 top-level exception handler, assign other functions to replace these.\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1129 \n\
48470 3d868254ff7e correct docstring Benjamin Peterson <benjamin@python.org> parents: 48467 diff changeset	1130 stdin -- standard input file object; used by input()\n\
40788 e9a6234b26af * Remove PRINT_ITEM(_TO), PRINT_NEWLINE(_TO) opcodes. Georg Brandl <georg@python.org> parents: 40737 diff changeset	1131 stdout -- standard output file object; used by print()\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1132 stderr -- standard error object; used for error messages\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1133 By assigning other file objects (or objects that behave like files)\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1134 to these, it is possible to redirect all of the interpreter's I/O.\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1135 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1136 last_type -- type of last uncaught exception\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1137 last_value -- value of last uncaught exception\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1138 last_traceback -- traceback of last uncaught exception\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1139 These three are only available in an interactive session after a\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1140 traceback has been printed.\n\
9885 030ee50bd8d1 Jim Ahlstrom patch: the module doc string is too long for 16-bit VC Guido van Rossum <guido@python.org> parents: 9746 diff changeset	1141 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1142 )
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1143 /* concatenating string here */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1144 PyDoc_STR(
9885 030ee50bd8d1 Jim Ahlstrom patch: the module doc string is too long for 16-bit VC Guido van Rossum <guido@python.org> parents: 9746 diff changeset	1145 "\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1146 Static objects:\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1147 \n\
44311 303727c58b51 Fixed #1630 Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1148 float_info -- a dict with information about the float implementation.\n\
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 51378 diff changeset	1149 int_info -- a struct sequence with information about the int implementation.\n\
43100 4e6b4ba60c3b Remove the simple slicing API. All slicing is now done with slice objects. Thomas Wouters <thomas@python.org> parents: 42896 diff changeset	1150 maxsize -- the largest supported length of containers.\n\
18298 982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18136 diff changeset	1151 maxunicode -- the largest supported character\n\
21833 070d392042e3 Fix spelling mistakes. Bugfix candidates. Neal Norwitz <nnorwitz@gmail.com> parents: 21712 diff changeset	1152 builtin_module_names -- tuple of module names built into this interpreter\n\
44311 303727c58b51 Fixed #1630 Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1153 subversion -- subversion information of the build as tuple\n\
12394 60dd95c75999 Define version_info to be a tuple (major, minor, micro, level); level Fred Drake <fdrake@acm.org> parents: 12136 diff changeset	1154 version -- the version of this interpreter as a string\n\
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1155 version_info -- version information as a named tuple\n\
12394 60dd95c75999 Define version_info to be a tuple (major, minor, micro, level); level Fred Drake <fdrake@acm.org> parents: 12136 diff changeset	1156 hexversion -- version information encoded as a single integer\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1157 copyright -- copyright notice pertaining to this interpreter\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1158 platform -- platform identifier\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1159 executable -- pathname of this Python interpreter\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1160 prefix -- prefix used to find the Python library\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1161 exec_prefix -- prefix used to find the machine-specific Python library\n\
53185 97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1162 float_repr_style -- string indicating the style of repr() output for floats\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1163 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1164 )
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1165 #ifdef MS_WINDOWS
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1166 /* concatenating string here */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1167 PyDoc_STR(
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1168 "dllhandle -- [Windows only] integer handle of the Python DLL\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1169 winver -- [Windows only] version number of the Python DLL\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1170 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1171 )
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1172 #endif /* MS_WINDOWS */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1173 PyDoc_STR(
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1174 "__stdin__ -- the original stdin; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1175 __stdout__ -- the original stdout; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1176 __stderr__ -- the original stderr; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1177 __displayhook__ -- the original displayhook; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1178 __excepthook__ -- the original excepthook; don't touch!\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1179 \n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1180 Functions:\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1181 \n\
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44086 diff changeset	1182 displayhook() -- print an object to the screen, and save it in builtins._\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1183 excepthook() -- print an exception and its traceback to sys.stderr\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1184 exc_info() -- return thread-safe information about the current exception\n\
6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1185 exit() -- exit the interpreter by raising SystemExit\n\
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	1186 getdlopenflags() -- returns flags to be used for dlopen() calls\n\
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	1187 getprofile() -- get the global profiling function\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1188 getrefcount() -- return the reference count for an object (plus one :-)\n\
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	1189 getrecursionlimit() -- return the max recursion depth for the interpreter\n\
47466 58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	1190 getsizeof() -- return the size of an object in bytes\n\
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	1191 gettrace() -- get the global debug tracing function\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1192 setcheckinterval() -- control how often the interpreter checks for events\n\
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	1193 setdlopenflags() -- set the flags to be used for dlopen() calls\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1194 setprofile() -- set the global profiling function\n\
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	1195 setrecursionlimit() -- set the max recursion depth for the interpreter\n\
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1196 settrace() -- set the global debug tracing function\n\
13971 aa4202702252 The attempt to protect against MS_WIN16 compilers that do not support long Fred Drake <fdrake@acm.org> parents: 13968 diff changeset	1197 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1198 )
13971 aa4202702252 The attempt to protect against MS_WIN16 compilers that do not support long Fred Drake <fdrake@acm.org> parents: 13968 diff changeset	1199 /* end of sys_doc */ ;
8566 6e8b0e754a7f Added doc strings. Maybe the doc string for the module itself is a bit Guido van Rossum <guido@python.org> parents: 8314 diff changeset	1200
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1201 /* Subversion branch and revision management */
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1202 static const char _patchlevel_revision[] = PY_PATCHLEVEL_REVISION;
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1203 static const char headurl[] = "$HeadURL$";
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1204 static int svn_initialized;
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1205 static char patchlevel_revision[50]; /* Just the number */
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1206 static char branch[50];
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1207 static char shortbranch[50];
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1208 static const char *svn_revision;
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1209
36212 cee05980f1fd svnversion_init(): Use standard layout for function defn. Tim Peters <tim.peters@gmail.com> parents: 36211 diff changeset	1210 static void
cee05980f1fd svnversion_init(): Use standard layout for function defn. Tim Peters <tim.peters@gmail.com> parents: 36211 diff changeset	1211 svnversion_init(void)
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1212 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1213 const char python, br_start, br_end, br_end2, *svnversion;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1214 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1215 int istag = 0;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1216
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1217 if (svn_initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1218 return;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1219
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1220 python = strstr(headurl, "/python/");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1221 if (!python) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1222 strcpy(branch, "unknown branch");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1223 strcpy(shortbranch, "unknown");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1224 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1225 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1226 br_start = python + 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1227 br_end = strchr(br_start, '/');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1228 assert(br_end);
42703 8bad8722f0e6 Patch #1774414: make it possible to use SVK to develop Python. Collin Winter <collinw@gmail.com> parents: 42622 diff changeset	1229
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1230 /* Works even for trunk,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1231 as we are in trunk/Python/sysmodule.c */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1232 br_end2 = strchr(br_end+1, '/');
42703 8bad8722f0e6 Patch #1774414: make it possible to use SVK to develop Python. Collin Winter <collinw@gmail.com> parents: 42622 diff changeset	1233
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1234 istag = strncmp(br_start, "tags", 4) == 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1235 if (strncmp(br_start, "trunk", 5) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1236 strcpy(branch, "trunk");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1237 strcpy(shortbranch, "trunk");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1238 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1239 else if (istag \|\| strncmp(br_start, "branches", 8) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1240 len = br_end2 - br_start;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1241 strncpy(branch, br_start, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1242 branch[len] = '\0';
42703 8bad8722f0e6 Patch #1774414: make it possible to use SVK to develop Python. Collin Winter <collinw@gmail.com> parents: 42622 diff changeset	1243
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1244 len = br_end2 - (br_end + 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1245 strncpy(shortbranch, br_end + 1, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1246 shortbranch[len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1247 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1248 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1249 Py_FatalError("bad HeadURL");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1250 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1251 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1252 }
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1253
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1254
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1255 svnversion = _Py_svnversion();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1256 if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1257 svn_revision = svnversion;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1258 else if (istag) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1259 len = strlen(_patchlevel_revision);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1260 assert(len >= 13);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1261 assert(len < (sizeof(patchlevel_revision) + 13));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1262 strncpy(patchlevel_revision, _patchlevel_revision + 11,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1263 len - 13);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1264 patchlevel_revision[len - 13] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1265 svn_revision = patchlevel_revision;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1266 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1267 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1268 svn_revision = "";
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	1269
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1270 svn_initialized = 1;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1271 }
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1272
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1273 /* Return svnversion output if available.
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1274 Else return Revision of patchlevel.h if on branch.
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1275 Else return empty string */
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1276 const char*
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1277 Py_SubversionRevision()
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1278 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1279 svnversion_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1280 return svn_revision;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1281 }
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1282
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1283 const char*
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1284 Py_SubversionShortBranch()
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1285 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1286 svnversion_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1287 return shortbranch;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1288 }
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1289
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1290
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1291 PyDoc_STRVAR(flags__doc__,
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1292 "sys.flags\n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1293 \n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1294 Flags provided through command line arguments or environment vars.");
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1295
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1296 static PyTypeObject FlagsType;
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1297
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1298 static PyStructSequence_Field flags_fields[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1299 {"debug", "-d"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1300 {"division_warning", "-Q"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1301 {"inspect", "-i"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1302 {"interactive", "-i"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1303 {"optimize", "-O or -OO"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1304 {"dont_write_bytecode", "-B"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1305 {"no_user_site", "-s"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1306 {"no_site", "-S"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1307 {"ignore_environment", "-E"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1308 {"verbose", "-v"},
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1309 #ifdef RISCOS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1310 {"riscos_wimp", "???"},
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1311 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1312 /* {"unbuffered", "-u"}, */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1313 /* {"skip_first", "-x"}, */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1314 {"bytes_warning", "-b"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1315 {0}
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1316 };
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1317
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1318 static PyStructSequence_Desc flags_desc = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1319 "sys.flags", /* name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1320 flags__doc__, /* doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1321 flags_fields, /* fields */
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1322 #ifdef RISCOS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1323 12
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1324 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1325 11
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1326 #endif
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1327 };
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1328
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1329 static PyObject*
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1330 make_flags(void)
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1331 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1332 int pos = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1333 PyObject *seq;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1334
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1335 seq = PyStructSequence_New(&FlagsType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1336 if (seq == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1337 return NULL;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1338
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1339 #define SetFlag(flag) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1340 PyStructSequence_SET_ITEM(seq, pos++, PyLong_FromLong(flag))
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1341
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1342 SetFlag(Py_DebugFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1343 SetFlag(Py_DivisionWarningFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1344 SetFlag(Py_InspectFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1345 SetFlag(Py_InteractiveFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1346 SetFlag(Py_OptimizeFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1347 SetFlag(Py_DontWriteBytecodeFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1348 SetFlag(Py_NoUserSiteDirectory);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1349 SetFlag(Py_NoSiteFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1350 SetFlag(Py_IgnoreEnvironmentFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1351 SetFlag(Py_VerboseFlag);
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1352 #ifdef RISCOS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1353 SetFlag(Py_RISCOSWimpFlag);
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1354 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1355 /* SetFlag(saw_unbuffered_flag); */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1356 /* SetFlag(skipfirstline); */
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1357 SetFlag(Py_BytesWarningFlag);
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1358 #undef SetFlag
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1359
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1360 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1361 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1362 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1363 return seq;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1364 }
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1365
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1366 PyDoc_STRVAR(version_info__doc__,
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1367 "sys.version_info\n\
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1368 \n\
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1369 Version information as a named tuple.");
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1370
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1371 static PyTypeObject VersionInfoType;
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1372
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1373 static PyStructSequence_Field version_info_fields[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1374 {"major", "Major release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1375 {"minor", "Minor release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1376 {"micro", "Patch release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1377 {"releaselevel", "'alpha', 'beta', 'candidate', or 'release'"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1378 {"serial", "Serial release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1379 {0}
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1380 };
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1381
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1382 static PyStructSequence_Desc version_info_desc = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1383 "sys.version_info", /* name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1384 version_info__doc__, /* doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1385 version_info_fields, /* fields */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1386 5
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1387 };
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1388
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1389 static PyObject *
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1390 make_version_info(void)
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1391 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1392 PyObject *version_info;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1393 char *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1394 int pos = 0;
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1395
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1396 version_info = PyStructSequence_New(&VersionInfoType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1397 if (version_info == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1398 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1399 }
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1400
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1401 /*
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1402 * These release level checks are mutually exclusive and cover
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1403 * the field, so don't get too fancy with the pre-processor!
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1404 */
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1405 #if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_ALPHA
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1406 s = "alpha";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1407 #elif PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_BETA
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1408 s = "beta";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1409 #elif PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_GAMMA
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1410 s = "candidate";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1411 #elif PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_FINAL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1412 s = "final";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1413 #endif
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1414
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1415 #define SetIntItem(flag) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1416 PyStructSequence_SET_ITEM(version_info, pos++, PyLong_FromLong(flag))
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1417 #define SetStrItem(flag) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1418 PyStructSequence_SET_ITEM(version_info, pos++, PyUnicode_FromString(flag))
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1419
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1420 SetIntItem(PY_MAJOR_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1421 SetIntItem(PY_MINOR_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1422 SetIntItem(PY_MICRO_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1423 SetStrItem(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1424 SetIntItem(PY_RELEASE_SERIAL);
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1425 #undef SetIntItem
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1426 #undef SetStrItem
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1427
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1428 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1429 Py_CLEAR(version_info);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1430 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1431 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1432 return version_info;
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1433 }
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1434
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47489 diff changeset	1435 static struct PyModuleDef sysmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1436 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1437 "sys",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1438 sys_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1439 -1, /* multiple "initialization" just copies the module dict. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1440 sys_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1441 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1442 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1443 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1444 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47489 diff changeset	1445 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47489 diff changeset	1446
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5863 diff changeset	1447 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1448 _PySys_Init(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1449 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1450 PyObject m, v, *sysdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1451 char *s;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5863 diff changeset	1452
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1453 m = PyModule_Create(&sysmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1454 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1455 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1456 sysdict = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1457 #define SET_SYS_FROM_STRING(key, value) \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1458 v = value; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1459 if (v != NULL) \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1460 PyDict_SetItemString(sysdict, key, v); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1461 Py_XDECREF(v)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5863 diff changeset	1462
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1463 /* Check that stdin is not a directory
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1464 Using shell redirection, you can redirect stdin to a directory,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1465 crashing the Python interpreter. Catch this common mistake here
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1466 and output a useful error message. Note that under MS Windows,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1467 the shell already prevents that. */
50743 e8154bd322cb Merged revisions 68540 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	1468 #if !defined(MS_WINDOWS)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1469 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1470 struct stat sb;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1471 if (fstat(fileno(stdin), &sb) == 0 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1472 S_ISDIR(sb.st_mode)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1473 /* There's nothing more we can do. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1474 /* Py_FatalError() will core dump, so just exit. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1475 PySys_WriteStderr("Python error: <stdin> is a directory, cannot continue\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1476 exit(EXIT_FAILURE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1477 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1478 }
50743 e8154bd322cb Merged revisions 68540 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	1479 #endif
35673 612a12178e47 SF bug #887946, segfault if redirecting directory Neal Norwitz <nnorwitz@gmail.com> parents: 35572 diff changeset	1480
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1481 /* stdin/stdout/stderr are now set by pythonrun.c */
29065 bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	1482
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1483 PyDict_SetItemString(sysdict, "__displayhook__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1484 PyDict_GetItemString(sysdict, "displayhook"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1485 PyDict_SetItemString(sysdict, "__excepthook__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1486 PyDict_GetItemString(sysdict, "excepthook"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1487 SET_SYS_FROM_STRING("version",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1488 PyUnicode_FromString(Py_GetVersion()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1489 SET_SYS_FROM_STRING("hexversion",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1490 PyLong_FromLong(PY_VERSION_HEX));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1491 svnversion_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1492 SET_SYS_FROM_STRING("subversion",
62155 600c23127207 Issue #8848: U / U# formats of Py_BuildValue() are just alias to s / s# Victor Stinner <victor.stinner@haypocalc.com> parents: 61873 diff changeset	1493 Py_BuildValue("(sss)", "CPython", branch,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1494 svn_revision));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1495 SET_SYS_FROM_STRING("dont_write_bytecode",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1496 PyBool_FromLong(Py_DontWriteBytecodeFlag));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1497 SET_SYS_FROM_STRING("api_version",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1498 PyLong_FromLong(PYTHON_API_VERSION));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1499 SET_SYS_FROM_STRING("copyright",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1500 PyUnicode_FromString(Py_GetCopyright()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1501 SET_SYS_FROM_STRING("platform",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1502 PyUnicode_FromString(Py_GetPlatform()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1503 SET_SYS_FROM_STRING("executable",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1504 PyUnicode_FromWideChar(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1505 Py_GetProgramFullPath(), -1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1506 SET_SYS_FROM_STRING("prefix",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1507 PyUnicode_FromWideChar(Py_GetPrefix(), -1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1508 SET_SYS_FROM_STRING("exec_prefix",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1509 PyUnicode_FromWideChar(Py_GetExecPrefix(), -1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1510 SET_SYS_FROM_STRING("maxsize",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1511 PyLong_FromSsize_t(PY_SSIZE_T_MAX));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1512 SET_SYS_FROM_STRING("float_info",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1513 PyFloat_GetInfo());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1514 SET_SYS_FROM_STRING("int_info",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1515 PyLong_GetInfo());
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1516 /* initialize hash_info */
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1517 if (Hash_InfoType.tp_name == 0)
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1518 PyStructSequence_InitType(&Hash_InfoType, &hash_info_desc);
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1519 SET_SYS_FROM_STRING("hash_info",
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1520 get_hash_info());
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1521 SET_SYS_FROM_STRING("maxunicode",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1522 PyLong_FromLong(PyUnicode_GetMax()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1523 SET_SYS_FROM_STRING("builtin_module_names",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1524 list_builtin_module_names());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1525 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1526 /* Assumes that longs are at least 2 bytes long.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1527 Should be safe! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1528 unsigned long number = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1529 char *value;
13968 841cf9012ac3 Add a byte_order value to the sys module. The value is "big" for Fred Drake <fdrake@acm.org> parents: 13694 diff changeset	1530
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1531 s = (char *) &number;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1532 if (s[0] == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1533 value = "big";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1534 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1535 value = "little";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1536 SET_SYS_FROM_STRING("byteorder",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1537 PyUnicode_FromString(value));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1538 }
4126 c80c515999b9 Use MS_DLL_ID as sys.winver Guido van Rossum <guido@python.org> parents: 3877 diff changeset	1539 #ifdef MS_COREDLL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1540 SET_SYS_FROM_STRING("dllhandle",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1541 PyLong_FromVoidPtr(PyWin_DLLhModule));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1542 SET_SYS_FROM_STRING("winver",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1543 PyUnicode_FromString(PyWin_DLLVersionString));
3490 1dfc519ea3cb Under NT, define sys.dllhandle and sys.winver (Mark H.). Guido van Rossum <guido@python.org> parents: 3326 diff changeset	1544 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1545 if (warnoptions == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1546 warnoptions = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1547 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1548 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1549 Py_INCREF(warnoptions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1550 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1551 if (warnoptions != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1552 PyDict_SetItemString(sysdict, "warnoptions", warnoptions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1553 }
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	1554
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1555 /* version_info */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1556 if (VersionInfoType.tp_name == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1557 PyStructSequence_InitType(&VersionInfoType, &version_info_desc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1558 SET_SYS_FROM_STRING("version_info", make_version_info());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1559 /* prevent user from creating new instances */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1560 VersionInfoType.tp_init = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1561 VersionInfoType.tp_new = NULL;
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1562
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1563 /* flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1564 if (FlagsType.tp_name == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1565 PyStructSequence_InitType(&FlagsType, &flags_desc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1566 SET_SYS_FROM_STRING("flags", make_flags());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1567 /* prevent user from creating new instances */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1568 FlagsType.tp_init = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1569 FlagsType.tp_new = NULL;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1570
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1571
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1572 #if defined(MS_WINDOWS)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1573 /* getwindowsversion */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1574 if (WindowsVersionType.tp_name == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1575 PyStructSequence_InitType(&WindowsVersionType, &windows_version_desc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1576 /* prevent user from creating new instances */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1577 WindowsVersionType.tp_init = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1578 WindowsVersionType.tp_new = NULL;
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1579 #endif
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1580
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1581 /* float repr style: 0.03 (short) vs 0.029999999999999999 (legacy) */
53185 97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1582 #ifndef PY_NO_SHORT_FLOAT_REPR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1583 SET_SYS_FROM_STRING("float_repr_style",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1584 PyUnicode_FromString("short"));
53185 97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1585 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1586 SET_SYS_FROM_STRING("float_repr_style",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1587 PyUnicode_FromString("legacy"));
53185 97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1588 #endif
97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1589
45071 f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	1590 #undef SET_SYS_FROM_STRING
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1591 if (PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1592 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1593 return m;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1594 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1595
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	1596 static PyObject *
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1597 makepathobject(const wchar_t *path, wchar_t delim)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1598 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1599 int i, n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1600 const wchar_t *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1601 PyObject v, w;
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	1602
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1603 n = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1604 p = path;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1605 while ((p = wcschr(p, delim)) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1606 n++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1607 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1608 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1609 v = PyList_New(n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1610 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1611 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1612 for (i = 0; ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1613 p = wcschr(path, delim);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1614 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1615 p = path + wcslen(path); /* End of string */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1616 w = PyUnicode_FromWideChar(path, (Py_ssize_t)(p - path));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1617 if (w == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1618 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1619 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1620 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1621 PyList_SetItem(v, i, w);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1622 if (*p == '\0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1623 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1624 path = p+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1625 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1626 return v;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1627 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1628
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1629 void
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1630 PySys_SetPath(const wchar_t *path)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1631 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1632 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1633 if ((v = makepathobject(path, DELIM)) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1634 Py_FatalError("can't create sys.path");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1635 if (PySys_SetObject("path", v) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1636 Py_FatalError("can't assign sys.path");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1637 Py_DECREF(v);
83 f6bcf3c1d714 Empty all modules' symbol tables, so most circular references are Guido van Rossum <guido@python.org> parents: 6 diff changeset	1638 }
f6bcf3c1d714 Empty all modules' symbol tables, so most circular references are Guido van Rossum <guido@python.org> parents: 6 diff changeset	1639
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	1640 static PyObject *
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1641 makeargvobject(int argc, wchar_t **argv)
83 f6bcf3c1d714 Empty all modules' symbol tables, so most circular references are Guido van Rossum <guido@python.org> parents: 6 diff changeset	1642 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1643 PyObject *av;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1644 if (argc <= 0 \|\| argv == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1645 /* Ensure at least one (empty) argument is seen */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1646 static wchar_t *empty_argv[1] = {L""};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1647 argv = empty_argv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1648 argc = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1649 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1650 av = PyList_New(argc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1651 if (av != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1652 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1653 for (i = 0; i < argc; i++) {
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	1654 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1655 PyObject *v;
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	1656
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1657 /* argv[0] is the script pathname if known */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1658 if (i == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1659 char* fn = decc$translate_vms(argv[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1660 if ((fn == (char )0) \|\| fn == (char )-1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1661 v = PyUnicode_FromString(argv[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1662 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1663 v = PyUnicode_FromString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1664 decc$translate_vms(argv[0]));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1665 } else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1666 v = PyUnicode_FromString(argv[i]);
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	1667 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1668 PyObject *v = PyUnicode_FromWideChar(argv[i], -1);
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	1669 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1670 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1671 Py_DECREF(av);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1672 av = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1673 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1674 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1675 PyList_SetItem(av, i, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1676 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1677 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1678 return av;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1679 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1680
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1681 #ifdef HAVE_REALPATH
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1682 static wchar_t*
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1683 _wrealpath(const wchar_t path, wchar_t resolved_path)
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1684 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1685 char cpath[PATH_MAX];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1686 char cresolved_path[PATH_MAX];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1687 char *res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1688 size_t r;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1689 r = wcstombs(cpath, path, PATH_MAX);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1690 if (r == (size_t)-1 \|\| r >= PATH_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1691 errno = EINVAL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1692 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1693 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1694 res = realpath(cpath, cresolved_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1695 if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1696 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1697 r = mbstowcs(resolved_path, cresolved_path, PATH_MAX);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1698 if (r == (size_t)-1 \|\| r >= PATH_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1699 errno = EINVAL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1700 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1701 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1702 return resolved_path;
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1703 }
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1704 #endif
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1705
64110 212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1706 #define _HAVE_SCRIPT_ARGUMENT(argc, argv) \
212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1707 (argc > 0 && argv0 != NULL && \
212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1708 wcscmp(argv0, L"-c") != 0 && wcscmp(argv0, L"-m") != 0)
212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1709
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1710 void
61790 795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1711 PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1712 {
27977 0fe321e78ad3 - sys.path[0] (the directory from which the script is loaded) is now Guido van Rossum <guido@python.org> parents: 27712 diff changeset	1713 #if defined(HAVE_REALPATH)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1714 wchar_t fullpath[MAXPATHLEN];
50743 e8154bd322cb Merged revisions 68540 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	1715 #elif defined(MS_WINDOWS) && !defined(MS_WINCE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1716 wchar_t fullpath[MAX_PATH];
27156 585a6460f577 Patch #664376: sys.path[0] should contain absolute pathname. Thomas Heller <theller@ctypes.org> parents: 25666 diff changeset	1717 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1718 PyObject *av = makeargvobject(argc, argv);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1719 PyObject *path = PySys_GetObject("path");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1720 if (av == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1721 Py_FatalError("no mem for sys.argv");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1722 if (PySys_SetObject("argv", av) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1723 Py_FatalError("can't assign sys.argv");
61790 795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1724 if (updatepath && path != NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1725 wchar_t *argv0 = argv[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1726 wchar_t *p = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1727 Py_ssize_t n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1728 PyObject *a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1729 extern int _Py_wreadlink(const wchar_t , wchar_t , size_t);
5340 db673e98f28d Expand one level of symbolic link in sys.argv[0] before inserting its Guido van Rossum <guido@python.org> parents: 5047 diff changeset	1730 #ifdef HAVE_READLINK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1731 wchar_t link[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1732 wchar_t argv0copy[2*MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1733 int nr = 0;
64110 212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1734 if (_HAVE_SCRIPT_ARGUMENT(argc, argv))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1735 nr = _Py_wreadlink(argv0, link, MAXPATHLEN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1736 if (nr > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1737 /* It's a symlink */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1738 link[nr] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1739 if (link[0] == SEP)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1740 argv0 = link; /* Link to absolute path */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1741 else if (wcschr(link, SEP) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1742 ; /* Link without path */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1743 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1744 /* Must join(dirname(argv0), link) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1745 wchar_t *q = wcsrchr(argv0, SEP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1746 if (q == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1747 argv0 = link; /* argv0 without path */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1748 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1749 /* Must make a copy */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1750 wcscpy(argv0copy, argv0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1751 q = wcsrchr(argv0copy, SEP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1752 wcscpy(q+1, link);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1753 argv0 = argv0copy;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1754 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1755 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1756 }
5340 db673e98f28d Expand one level of symbolic link in sys.argv[0] before inserting its Guido van Rossum <guido@python.org> parents: 5047 diff changeset	1757 #endif /* HAVE_READLINK */
4256 e225e70fd657 Changes to setpythonpath(): Guido van Rossum <guido@python.org> parents: 4126 diff changeset	1758 #if SEP == '\\' /* Special case for MS filename syntax */
64110 212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1759 if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1760 wchar_t *q;
50743 e8154bd322cb Merged revisions 68540 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	1761 #if defined(MS_WINDOWS) && !defined(MS_WINCE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1762 /* This code here replaces the first element in argv with the full
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1763 path that it represents. Under CE, there are no relative paths so
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1764 the argument must be the full path anyway. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1765 wchar_t *ptemp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1766 if (GetFullPathNameW(argv0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1767 sizeof(fullpath)/sizeof(fullpath[0]),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1768 fullpath,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1769 &ptemp)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1770 argv0 = fullpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1771 }
27156 585a6460f577 Patch #664376: sys.path[0] should contain absolute pathname. Thomas Heller <theller@ctypes.org> parents: 25666 diff changeset	1772 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1773 p = wcsrchr(argv0, SEP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1774 /* Test for alternate separator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1775 q = wcsrchr(p ? p : argv0, '/');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1776 if (q != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1777 p = q;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1778 if (p != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1779 n = p + 1 - argv0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1780 if (n > 1 && p[-1] != ':')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1781 n--; /* Drop trailing separator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1782 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1783 }
4256 e225e70fd657 Changes to setpythonpath(): Guido van Rossum <guido@python.org> parents: 4126 diff changeset	1784 #else /* All other filename syntaxes */
64110 212a16f906a6 Issue #8202: Set sys.argv[0] to -m rather than -c while searching for the module to execute. Also updates all the cmd_line_script tests to validate the setting of sys.path[0] and the current working directory Nick Coghlan <ncoghlan@gmail.com> parents: 64064 diff changeset	1785 if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) {
27977 0fe321e78ad3 - sys.path[0] (the directory from which the script is loaded) is now Guido van Rossum <guido@python.org> parents: 27712 diff changeset	1786 #if defined(HAVE_REALPATH)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1787 if (_wrealpath(argv0, fullpath)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1788 argv0 = fullpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1789 }
27977 0fe321e78ad3 - sys.path[0] (the directory from which the script is loaded) is now Guido van Rossum <guido@python.org> parents: 27712 diff changeset	1790 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1791 p = wcsrchr(argv0, SEP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1792 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1793 if (p != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1794 n = p + 1 - argv0;
4256 e225e70fd657 Changes to setpythonpath(): Guido van Rossum <guido@python.org> parents: 4126 diff changeset	1795 #if SEP == '/' /* Special case for Unix filename syntax */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1796 if (n > 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1797 n--; /* Drop trailing separator */
4256 e225e70fd657 Changes to setpythonpath(): Guido van Rossum <guido@python.org> parents: 4126 diff changeset	1798 #endif /* Unix */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1799 }
4256 e225e70fd657 Changes to setpythonpath(): Guido van Rossum <guido@python.org> parents: 4126 diff changeset	1800 #endif /* All others */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1801 a = PyUnicode_FromWideChar(argv0, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1802 if (a == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1803 Py_FatalError("no mem for sys.path insertion");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1804 if (PyList_Insert(path, 0, a) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1805 Py_FatalError("sys.path.insert(0) failed");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1806 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1807 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1808 Py_DECREF(av);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1809 }
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1810
61790 795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1811 void
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1812 PySys_SetArgv(int argc, wchar_t **argv)
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1813 {
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1814 PySys_SetArgvEx(argc, argv, 1);
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1815 }
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1816
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1817 /* Reimplementation of PyFile_WriteString() no calling indirectly
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1818 PyErr_CheckSignals(): avoid the call to PyObject_Str(). */
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1819
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1820 static int
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1821 sys_pyfile_write_unicode(PyObject unicode, PyObject file)
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1822 {
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1823 PyObject writer = NULL, args = NULL, *result = NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1824 int err;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1825
62189 d281ed59ff0b sys_pyfile_write() does nothing if file is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 62155 diff changeset	1826 if (file == NULL)
d281ed59ff0b sys_pyfile_write() does nothing if file is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 62155 diff changeset	1827 return -1;
d281ed59ff0b sys_pyfile_write() does nothing if file is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 62155 diff changeset	1828
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1829 writer = PyObject_GetAttrString(file, "write");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1830 if (writer == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1831 goto error;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1832
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1833 args = PyTuple_Pack(1, unicode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1834 if (args == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1835 goto error;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1836
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1837 result = PyEval_CallObject(writer, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1838 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1839 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1840 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1841 err = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1842 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1843 }
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1844
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1845 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1846 err = -1;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1847 finally:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1848 Py_XDECREF(writer);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1849 Py_XDECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1850 Py_XDECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1851 return err;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1852 }
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1853
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1854 static int
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1855 sys_pyfile_write(const char text, PyObject file)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1856 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1857 PyObject *unicode = NULL;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1858 int err;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1859
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1860 if (file == NULL)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1861 return -1;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1862
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1863 unicode = PyUnicode_FromString(text);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1864 if (unicode == NULL)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1865 return -1;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1866
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1867 err = sys_pyfile_write_unicode(unicode, file);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1868 Py_DECREF(unicode);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1869 return err;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1870 }
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1871
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1872 /* APIs to write to sys.stdout or sys.stderr using a printf-like interface.
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1873 Adapted from code submitted by Just van Rossum.
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1874
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1875 PySys_WriteStdout(format, ...)
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1876 PySys_WriteStderr(format, ...)
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1877
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1878 The first function writes to sys.stdout; the second to sys.stderr. When
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1879 there is a problem, they write to the real (C level) stdout or stderr;
9328 81574e4646b4 Patches for mywrite() by Marc Lemburg: save/restore the error state Guido van Rossum <guido@python.org> parents: 8840 diff changeset	1880 no exceptions are raised.
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1881
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1882 PyErr_CheckSignals() is not called to avoid the execution of the Python
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1883 signal handlers: they may raise a new exception whereas sys_write()
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1884 ignores all exceptions.
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1885
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1886 Both take a printf-style format string as their first argument followed
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1887 by a variable length argument list determined by the format string.
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1888
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1889 * WARNING *
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1890
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1891 The format should limit the total size of the formatted output string to
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1892 1000 bytes. In particular, this means that no unrestricted "%s" formats
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1893 should occur; these should be limited using "%.<N>s where <N> is a
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1894 decimal number calculated so that <N> plus the maximum size of other
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1895 formatted text does not exceed 1000 bytes. Also watch out for "%f",
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1896 which can print hundreds of digits for very large numbers.
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1897
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1898 */
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1899
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1900 static void
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1901 sys_write(char name, FILE fp, const char *format, va_list va)
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1902 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1903 PyObject *file;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1904 PyObject error_type, error_value, *error_traceback;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1905 char buffer[1001];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1906 int written;
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1907
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1908 PyErr_Fetch(&error_type, &error_value, &error_traceback);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1909 file = PySys_GetObject(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1910 written = PyOS_vsnprintf(buffer, sizeof(buffer), format, va);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1911 if (sys_pyfile_write(buffer, file) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1912 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1913 fputs(buffer, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1914 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1915 if (written < 0 \|\| (size_t)written >= sizeof(buffer)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1916 const char *truncated = "... truncated";
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1917 if (sys_pyfile_write(truncated, file) != 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1918 fputs(truncated, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1919 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1920 PyErr_Restore(error_type, error_value, error_traceback);
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1921 }
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1922
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1923 void
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1924 PySys_WriteStdout(const char *format, ...)
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1925 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1926 va_list va;
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1927
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1928 va_start(va, format);
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1929 sys_write("stdout", stdout, format, va);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1930 va_end(va);
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1931 }
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1932
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1933 void
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1934 PySys_WriteStderr(const char *format, ...)
f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1935 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1936 va_list va;
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1937
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1938 va_start(va, format);
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1939 sys_write("stderr", stderr, format, va);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1940 va_end(va);
8314 f94d5ae642a9 New APIs to write to sys.stdout or sys.stderr using a printf-like interface. Guido van Rossum <guido@python.org> parents: 7402 diff changeset	1941 }
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1942
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1943 static void
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1944 sys_format(char name, FILE fp, const char *format, va_list va)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1945 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1946 PyObject file, message;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1947 PyObject error_type, error_value, *error_traceback;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1948 char *utf8;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1949
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1950 PyErr_Fetch(&error_type, &error_value, &error_traceback);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1951 file = PySys_GetObject(name);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1952 message = PyUnicode_FromFormatV(format, va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1953 if (message != NULL) {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1954 if (sys_pyfile_write_unicode(message, file) != 0) {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1955 PyErr_Clear();
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1956 utf8 = _PyUnicode_AsString(message);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1957 if (utf8 != NULL)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1958 fputs(utf8, fp);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1959 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1960 Py_DECREF(message);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1961 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1962 PyErr_Restore(error_type, error_value, error_traceback);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1963 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1964
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1965 void
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1966 PySys_FormatStdout(const char *format, ...)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1967 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1968 va_list va;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1969
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1970 va_start(va, format);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1971 sys_format("stdout", stdout, format, va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1972 va_end(va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1973 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1974
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1975 void
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1976 PySys_FormatStderr(const char *format, ...)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1977 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1978 va_list va;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1979
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1980 va_start(va, format);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1981 sys_format("stderr", stderr, format, va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1982 va_end(va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1983 }

Mercurial > cpython-lru_cache-weakref

annotate Python/sysmodule.c @ 64474:56d4373cecb7 v3.2a2