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

annotate Python/sysmodule.c @ 66556:724920a015f7

Remove redundant includes of headers that are already included by Python.h.

author	Georg Brandl <georg@python.org>
date	Tue, 30 Nov 2010 09:41:01 +0000
parents	8304bd765bcf
children	ba709ad3ff4c

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"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35673 diff changeset	18 #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	19 #include "frameobject.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	20
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	21 #include "osdefs.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	22
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	23 #ifdef MS_WINDOWS
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	24 #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	25 #include <windows.h>
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	26 #endif /* MS_WINDOWS */
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	27
4291 1427d61f1307 Rationalized MS ifdefs Guido van Rossum <guido@python.org> parents: 4256 diff changeset	28 #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	29 extern void *PyWin_DLLhModule;
6352 b62a7a59414e Get DLL version from a variable. Guido van Rossum <guido@python.org> parents: 5955 diff changeset	30 /* 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	31 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	32 #endif
1dfc519ea3cb Under NT, define sys.dllhandle and sys.winver (Mark H.). Guido van Rossum <guido@python.org> parents: 3326 diff changeset	33
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	34 #ifdef __VMS
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	35 #include <unixlib.h>
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	36 #endif
ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	37
29065 bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	38 #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	39 #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	40 #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	41 #endif
bf1634b023d5 Patch #612627: Add encoding attribute to file objects, and determine Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	42
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	43 PyObject *
42812 a99ec4befda8 Add const to input string parameters Neal Norwitz <nnorwitz@gmail.com> parents: 42703 diff changeset	44 PySys_GetObject(const char *name)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	45 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	46 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	47 PyObject *sd = tstate->interp->sysdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	48 if (sd == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	49 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	50 return PyDict_GetItemString(sd, name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	51 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	52
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53 int
42812 a99ec4befda8 Add const to input string parameters Neal Norwitz <nnorwitz@gmail.com> parents: 42703 diff changeset	54 PySys_SetObject(const char name, PyObject v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	55 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	56 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	57 PyObject *sd = tstate->interp->sysdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	58 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	59 if (PyDict_GetItemString(sd, name) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	60 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	61 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	62 return PyDict_DelItemString(sd, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	63 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	64 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	65 return PyDict_SetItemString(sd, name, v);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	66 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	67
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	68 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	69 sys_displayhook(PyObject self, PyObject o)
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	70 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	71 PyObject *outf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	72 PyInterpreterState *interp = PyThreadState_GET()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	73 PyObject *modules = interp->modules;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	74 PyObject *builtins = PyDict_GetItemString(modules, "builtins");
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	75
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	76 if (builtins == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	77 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	78 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	79 }
18805 4462c57f6c94 Patch number #422106 by Greg Ball, to fix segmentation Moshe Zadka <moshez@math.huji.ac.il> parents: 18689 diff changeset	80
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	81 /* Print value except if None */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	82 /* After printing, also assign to '_' */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	83 /* 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	84 if (o == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	85 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	86 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	87 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	88 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	89 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	90 outf = PySys_GetObject("stdout");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	91 if (outf == NULL \|\| outf == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	92 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	93 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	94 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	95 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	96 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	97 if (PyFile_WriteString("\n", outf) != 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 (PyObject_SetAttrString(builtins, "_", o) != 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 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	102 return Py_None;
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	103 }
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	104
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	105 PyDoc_STRVAR(displayhook_doc,
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	106 "displayhook(object) -> None\n"
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	107 "\n"
59300 29fac4b1a51e Merged revisions 78620 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 58507 diff changeset	108 "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	109 );
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	110
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	111 static PyObject *
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	112 sys_excepthook(PyObject* self, PyObject* args)
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	113 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	114 PyObject exc, value, *tb;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	115 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	116 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	117 PyErr_Display(exc, value, tb);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	118 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	119 return Py_None;
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	120 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	121
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	122 PyDoc_STRVAR(excepthook_doc,
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	123 "excepthook(exctype, value, traceback) -> None\n"
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	124 "\n"
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	125 "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	126 );
15811 1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	127
1a00d21910c8 Implementation of PEP-0217. Moshe Zadka <moshez@math.huji.ac.il> parents: 15595 diff changeset	128 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	129 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	130 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	131 PyThreadState *tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	132 tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	133 return Py_BuildValue(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	134 "(OOO)",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	135 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	136 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	137 tstate->exc_traceback != NULL ?
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	138 tstate->exc_traceback : Py_None);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5377 diff changeset	139 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5377 diff changeset	140
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	141 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	142 "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	143 \n\
28119 869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	144 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	145 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	146 );
869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	147
869695cba2cd - New function sys.exc_clear() clears the current exception. This is Guido van Rossum <guido@python.org> parents: 27977 diff changeset	148 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	149 sys_exit(PyObject self, PyObject args)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	150 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	151 PyObject *exit_code = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	152 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	153 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	154 /* 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	155 PyErr_SetObject(PyExc_SystemExit, exit_code);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	156 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	157 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	158
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	159 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	160 "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	161 \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	162 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	163 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	164 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	165 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	166 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	167 );
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	168
20943 e4d380f5f297 Include sys_getdefaultencoding in #ifdef Py_USING_UNICODE. Fixes #479571. Martin v. Löwis <martin@v.loewis.de> parents: 20655 diff changeset	169
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	170 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	171 sys_getdefaultencoding(PyObject *self)
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	172 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	173 return PyUnicode_FromString(PyUnicode_GetDefaultEncoding());
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	174 }
c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	175
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	176 PyDoc_STRVAR(getdefaultencoding_doc,
12877 78231bbe605d Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12649 diff changeset	177 "getdefaultencoding() -> string\n\
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	178 \n\
c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	179 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	180 implementation."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	181 );
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	182
c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	183 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	184 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	185 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	186 if (Py_FileSystemDefaultEncoding)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	187 return PyUnicode_FromString(Py_FileSystemDefaultEncoding);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	188 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	189 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	190 }
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	191
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	192 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	193 "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	194 \n\
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	195 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	196 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	197 );
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28119 diff changeset	198
49403 e822992cf6ce Issue #3187: Add sys.setfilesystemencoding. Martin v. Löwis <martin@v.loewis.de> parents: 48499 diff changeset	199 static PyObject *
40484 8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	200 sys_intern(PyObject self, PyObject args)
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	201 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	202 PyObject *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	203 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	204 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	205 if (PyUnicode_CheckExact(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	206 Py_INCREF(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	207 PyUnicode_InternInPlace(&s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	208 return s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	209 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	210 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	211 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	212 "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	213 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	214 }
40484 8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	215 }
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	216
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	217 PyDoc_STRVAR(intern_doc,
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	218 "intern(string) -> string\n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	219 \n\
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	220 ``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	221 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	222 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	223 same value.");
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	224
8565e3fea9b6 Patch #1601678: move intern() to sys.intern(). Georg Brandl <georg@python.org> parents: 40450 diff changeset	225
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	226 /*
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	227 * 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	228 * 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	229 */
31796 1c117dbb2def Enable the profiling of C functions (builtins and extensions) Nicholas Bastin <nick.bastin@gmail.com> parents: 30108 diff changeset	230 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	231
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	232 static int
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	233 trace_init(void)
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	234 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	235 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	236 "c_call", "c_exception", "c_return"};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	237 PyObject *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	238 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	239 for (i = 0; i < 7; ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	240 if (whatstrings[i] == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	241 name = PyUnicode_InternFromString(whatnames[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	242 if (name == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	243 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	244 whatstrings[i] = name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	245 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	246 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	247 return 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	248 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	249
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	250
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	251 static PyObject *
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	252 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	253 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	254 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	255 PyObject *args = PyTuple_New(3);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	256 PyObject *whatstr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	257 PyObject *result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	258
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	259 if (args == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	260 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	261 Py_INCREF(frame);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	262 whatstr = whatstrings[what];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	263 Py_INCREF(whatstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	264 if (arg == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	265 arg = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	266 Py_INCREF(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	267 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	268 PyTuple_SET_ITEM(args, 1, whatstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	269 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	270
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	271 /* call the Python-level function */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	272 PyFrame_FastToLocals(frame);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	273 result = PyEval_CallObject(callback, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	274 PyFrame_LocalsToFast(frame, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	275 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	276 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	277
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	278 /* cleanup */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	279 Py_DECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	280 return result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	281 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	282
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	283 static int
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	284 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	285 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	286 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	287 PyThreadState *tstate = frame->f_tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	288 PyObject *result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	289
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	290 if (arg == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	291 arg = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	292 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	293 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	294 PyEval_SetProfile(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	295 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	296 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	297 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	298 return 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	299 }
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	300
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	301 static int
e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	302 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	303 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	304 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	305 PyThreadState *tstate = frame->f_tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	306 PyObject *callback;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	307 PyObject *result;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	308
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	309 if (what == PyTrace_CALL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	310 callback = self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	311 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	312 callback = frame->f_trace;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	313 if (callback == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	314 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	315 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	316 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	317 PyEval_SetTrace(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	318 Py_XDECREF(frame->f_trace);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	319 frame->f_trace = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	320 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	321 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	322 if (result != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	323 PyObject *temp = frame->f_trace;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	324 frame->f_trace = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	325 Py_XDECREF(temp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	326 frame->f_trace = result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	327 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	328 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	329 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	330 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	331 return 0;
18326 e427afb5637f Revise the interface to the profiling and tracing support for the Fred Drake <fdrake@acm.org> parents: 18298 diff changeset	332 }
18136 4cb34314bd97 Instead of initializing & interning the strings passed to the profile Fred Drake <fdrake@acm.org> parents: 17396 diff changeset	333
12649 c92668766f5d M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12398 diff changeset	334 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	335 sys_settrace(PyObject self, PyObject args)
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	336 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	337 if (trace_init() == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	338 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	339 if (args == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	340 PyEval_SetTrace(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	341 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	342 PyEval_SetTrace(trace_trampoline, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	343 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	344 return Py_None;
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	345 }
bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	346
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	347 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	348 "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	349 \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	350 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	351 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	352 );
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	353
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	354 static PyObject *
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	355 sys_gettrace(PyObject self, PyObject args)
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	356 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	357 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	358 PyObject *temp = tstate->c_traceobj;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	359
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	360 if (temp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	361 temp = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	362 Py_INCREF(temp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	363 return temp;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	364 }
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	365
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	366 PyDoc_STRVAR(gettrace_doc,
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	367 "gettrace()\n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	368 \n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	369 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	370 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	371 );
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	372
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	373 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	374 sys_setprofile(PyObject self, PyObject args)
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	375 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	376 if (trace_init() == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	377 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	378 if (args == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	379 PyEval_SetProfile(NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	380 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	381 PyEval_SetProfile(profile_trampoline, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	382 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	383 return Py_None;
710 bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	384 }
bc5c77fa8006 Added settrace() and setprofile(). Guido van Rossum <guido@python.org> parents: 631 diff changeset	385
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	386 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	387 "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	388 \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	389 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	390 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	391 );
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	392
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	393 static PyObject *
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	394 sys_getprofile(PyObject self, PyObject args)
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	395 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	396 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	397 PyObject *temp = tstate->c_profileobj;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	398
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	399 if (temp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	400 temp = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	401 Py_INCREF(temp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	402 return temp;
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	403 }
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	404
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	405 PyDoc_STRVAR(getprofile_doc,
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	406 "getprofile()\n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	407 \n\
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	408 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	409 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	410 );
ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	411
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	412 static int _check_interval = 100;
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	413
44828 ef7d72d98485 Merged revisions 60124-60142 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	414 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	415 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	416 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	417 if (PyErr_WarnEx(PyExc_DeprecationWarning,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	418 "sys.getcheckinterval() and sys.setcheckinterval() "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	419 "are deprecated. Use sys.setswitchinterval() "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	420 "instead.", 1) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	421 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	422 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	423 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	424 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	425 return Py_None;
2093 e8cafb2b743a sys.check_interval=x -> sys.setcheckinterval(x) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	426 }
e8cafb2b743a sys.check_interval=x -> sys.setcheckinterval(x) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	427
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	428 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	429 "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	430 \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	431 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	432 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	433 );
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	434
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	435 static PyObject *
29765 e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	436 sys_getcheckinterval(PyObject self, PyObject args)
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 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.getswitchinterval() "
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 return PyLong_FromLong(_check_interval);
29765 e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	444 }
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	445
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	446 PyDoc_STRVAR(getcheckinterval_doc,
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	447 "getcheckinterval() -> current check interval; see setcheckinterval()."
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	448 );
e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	449
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	450 #ifdef WITH_THREAD
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	451 static PyObject *
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	452 sys_setswitchinterval(PyObject self, PyObject args)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	453 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	454 double d;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	455 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	456 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	457 if (d <= 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	458 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	459 "switch interval must be strictly positive");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	460 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	461 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	462 _PyEval_SetSwitchInterval((unsigned long) (1e6 * d));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	463 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	464 return Py_None;
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	465 }
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	466
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	467 PyDoc_STRVAR(setswitchinterval_doc,
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	468 "setswitchinterval(n)\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	469 \n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	470 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	471 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	472 interpreter executes long sequences of uninterruptible code\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	473 (this is implementation-specific and workload-dependent).\n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	474 \n\
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	475 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	476 A typical value is 0.005 (5 milliseconds)."
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	477 );
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	478
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	479 static PyObject *
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	480 sys_getswitchinterval(PyObject self, PyObject args)
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	481 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	482 return PyFloat_FromDouble(1e-6 * _PyEval_GetSwitchInterval());
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	483 }
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	484
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	485 PyDoc_STRVAR(getswitchinterval_doc,
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	486 "getswitchinterval() -> current thread switch interval; see setswitchinterval()."
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
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	489 #endif /* WITH_THREAD */
fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	490
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	491 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	492 static PyObject *
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	493 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	494 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	495 int bool;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	496 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	497
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	498 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	499 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	500 if (bool)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	501 tstate->interp->tscdump = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	502 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	503 tstate->interp->tscdump = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	504 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	505 return Py_None;
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	506
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	507 }
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	508
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	509 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	510 "settscdump(bool)\n\
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	511 \n\
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	512 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	513 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	514 processor's time-stamp counter."
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	515 );
32344 748129e6e108 Remove compiler warning Neal Norwitz <nnorwitz@gmail.com> parents: 32301 diff changeset	516 #endif /* TSC */
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	517
29765 e9e5832d706f New function sys.getcheckinterval(), to complement setcheckinterval(). Tim Peters <tim.peters@gmail.com> parents: 29065 diff changeset	518 static PyObject *
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	519 sys_setrecursionlimit(PyObject self, PyObject args)
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	520 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	521 int new_limit;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	522 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	523 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	524 if (new_limit <= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	525 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	526 "recursion limit must be positive");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	527 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	528 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	529 Py_SetRecursionLimit(new_limit);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	530 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	531 return Py_None;
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	532 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	533
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	534 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	535
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	536 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	537 "hash_info\n\
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	538 \n\
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	539 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	540 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	541
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	542 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	543 {"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	544 {"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	545 "function is based"},
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	546 {"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	547 {"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	548 {"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	549 {NULL, NULL}
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	550 };
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	551
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	552 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	553 "sys.hash_info",
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	554 hash_info_doc,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	555 hash_info_fields,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	556 5,
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	557 };
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	558
62828 1f37d082a9aa - sysmodule.c (get_hash_info): Define as static function. Matthias Klose <doko@ubuntu.com> parents: 62189 diff changeset	559 static PyObject *
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	560 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	561 {
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	562 PyObject *hash_info;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	563 int field = 0;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	564 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	565 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	566 return NULL;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	567 PyStructSequence_SET_ITEM(hash_info, field++,
65494 e8969fb822fc make hashes always the size of pointers; introduce Py_hash_t #9778 Benjamin Peterson <benjamin@python.org> parents: 65389 diff changeset	568 PyLong_FromLong(8*sizeof(Py_hash_t)));
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	569 PyStructSequence_SET_ITEM(hash_info, field++,
65603 be8ae6b17539 follow up to #9778: define and use an unsigned hash type Benjamin Peterson <benjamin@python.org> parents: 65575 diff changeset	570 PyLong_FromSsize_t(_PyHASH_MODULUS));
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	571 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	572 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	573 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	574 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	575 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	576 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	577 if (PyErr_Occurred()) {
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	578 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	579 return NULL;
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	580 }
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	581 return hash_info;
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
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	584
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	585 PyDoc_STRVAR(setrecursionlimit_doc,
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	586 "setrecursionlimit(n)\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	587 \n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	588 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	589 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	590 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	591 dependent."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	592 );
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	593
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	594 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	595 sys_getrecursionlimit(PyObject *self)
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	596 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	597 return PyLong_FromLong(Py_GetRecursionLimit());
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	598 }
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	599
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	600 PyDoc_STRVAR(getrecursionlimit_doc,
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	601 "getrecursionlimit()\n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	602 \n\
b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	603 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	604 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	605 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	606 );
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	607
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	608 #ifdef MS_WINDOWS
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	609 PyDoc_STRVAR(getwindowsversion_doc,
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	610 "getwindowsversion()\n\
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	611 \n\
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	612 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	613 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	614 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	615 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	616 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	617 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	618 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	619 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	620 );
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	621
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	622 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	623
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	624 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	625 {"major", "Major version number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	626 {"minor", "Minor version number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	627 {"build", "Build number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	628 {"platform", "Operating system platform"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	629 {"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	630 {"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	631 {"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	632 {"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	633 {"product_type", "System product type"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	634 {0}
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	635 };
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	636
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	637 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	638 "sys.getwindowsversion", /* name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	639 getwindowsversion_doc, /* doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	640 windows_version_fields, /* fields */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	641 5 /* For backward compatibility,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	642 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	643 via indexing, the rest are name only */
58507 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
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	646 static PyObject *
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	647 sys_getwindowsversion(PyObject *self)
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	648 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	649 PyObject *version;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	650 int pos = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	651 OSVERSIONINFOEX ver;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	652 ver.dwOSVersionInfoSize = sizeof(ver);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	653 if (!GetVersionEx((OSVERSIONINFO*) &ver))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	654 return PyErr_SetFromWindowsErr(0);
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	655
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	656 version = PyStructSequence_New(&WindowsVersionType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	657 if (version == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	658 return NULL;
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	659
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	660 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	661 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	662 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	663 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	664 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	665 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	666 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	667 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	668 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	669
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	670 return version;
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	671 }
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	672
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	673 #endif /* MS_WINDOWS */
4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	674
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	675 #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	676 static PyObject *
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	677 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	678 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	679 int new_val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	680 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	681 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	682 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	683 if (!tstate)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	684 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	685 tstate->interp->dlopenflags = new_val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	686 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	687 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	688 }
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	689
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	690 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	691 "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	692 \n\
55611 4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	693 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	694 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	695 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	696 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	697 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	698 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	699 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	700 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	701
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	702 static PyObject *
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	703 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	704 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	705 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	706 if (!tstate)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	707 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	708 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	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(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	712 "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	713 \n\
55611 4d38e51e7cdc Merged revisions 74062 via svnmerge from Georg Brandl <georg@python.org> parents: 54326 diff changeset	714 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	715 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	716
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	717 #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	718
1013 a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	719 #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	720 /* 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	721 #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	722
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	723 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	724 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	725 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	726 int flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	727 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	728 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	729 mallopt(M_DEBUG, flag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	730 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	731 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	732 }
a1ce5a949828 Add an optional interface to turn malloc debugging on and off. Guido van Rossum <guido@python.org> parents: 901 diff changeset	733 #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	734
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	735 static PyObject *
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	736 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	737 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	738 PyObject *res = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	739 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	740 static char *kwlist[] = {"object", "default", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	741 PyObject o, dflt = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	742 PyObject *method;
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	743
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	744 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	745 kwlist, &o, &dflt))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	746 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	747
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	748 /* 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	749 if (gc_head_size == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	750 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	751 if (gc_head_size == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	752 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	753 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	754
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	755 /* 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	756 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	757 return NULL;
53954 1b15a57e1f02 Merged revisions 72508 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53185 diff changeset	758
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	759 method = _PyObject_LookupSpecial(o, "__sizeof__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	760 &str__sizeof__);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	761 if (method == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	762 if (!PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	763 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	764 "Type %.100s doesn't define __sizeof__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	765 Py_TYPE(o)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	766 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	767 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	768 res = PyObject_CallFunctionObjArgs(method, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	769 Py_DECREF(method);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	770 }
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	771
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	772 /* Has a default value been given */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	773 if ((res == NULL) && (dflt != NULL) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	774 PyErr_ExceptionMatches(PyExc_TypeError))
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 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	777 Py_INCREF(dflt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	778 return dflt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	779 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	780 else if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	781 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	782
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	783 /* add gc_head size */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	784 if (PyObject_IS_GC(o)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	785 PyObject *tmp = res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	786 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	787 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	788 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	789 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	790 }
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	791
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	792 PyDoc_STRVAR(getsizeof_doc,
48467 c0c06ffaea83 Merged revisions 64842,64853,64856,64945 via svnmerge from Robert Schuppenies <okkotonushi@googlemail.com> parents: 47580 diff changeset	793 "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	794 \n\
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	795 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	796
58f4b60773fe Merged revisions 63856-63857,63859-63860 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47464 diff changeset	797 static PyObject *
20655 7344687bf2c0 Convert getrefcount() to METH_O, and sys_excepthook() to use Fred Drake <fdrake@acm.org> parents: 20247 diff changeset	798 sys_getrefcount(PyObject self, PyObject arg)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	799 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	800 return PyLong_FromSsize_t(arg->ob_refcnt);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	801 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	802
24126 fdf80e04e4bb Rearranged and added comments to object.h, to clarify many things Tim Peters <tim.peters@gmail.com> parents: 24071 diff changeset	803 #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	804 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	805 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	806 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	807 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	808 }
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	809 #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	810
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	811 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	812 "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	813 \n\
23947 37118b6e5f46 Fix the docstring for sys.getrefcount(). Fred Drake <fdrake@acm.org> parents: 23746 diff changeset	814 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	815 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	816 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	817 );
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	818
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	819 #ifdef COUNT_ALLOCS
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	820 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	821 sys_getcounts(PyObject *self)
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	822 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	823 extern PyObject *get_counts(void);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	824
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	825 return get_counts();
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	826 }
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	827 #endif
54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	828
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	829 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	830 "_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	831 \n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	832 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	833 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	834 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	835 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	836 \n\
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	837 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	838 purposes only."
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	839 );
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	840
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	841 static PyObject *
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	842 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	843 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	844 PyFrameObject *f = PyThreadState_GET()->frame;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	845 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	846
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	847 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	848 return NULL;
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	849
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	850 while (depth > 0 && f != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	851 f = f->f_back;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	852 --depth;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	853 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	854 if (f == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	855 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	856 "call stack is not deep enough");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	857 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	858 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	859 Py_INCREF(f);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	860 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	861 }
f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	862
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	863 PyDoc_STRVAR(current_frames_doc,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	864 "_current_frames() -> dictionary\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	865 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	866 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	867 current stack frame.\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	868 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	869 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	870 );
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	871
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	872 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	873 sys_current_frames(PyObject self, PyObject noargs)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	874 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	875 return _PyThread_CurrentFrames();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	876 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	877
28556 78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	878 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	879 "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	880 \n\
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	881 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	882 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	883 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	884 );
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	885
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	886 static PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	887 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	888 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	889 PyObject func, funcargs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	890 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	891 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	892 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	893 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code Guido van Rossum <guido@python.org> parents: 28174 diff changeset	894
27712 16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	895 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	896 "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	897 \n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	898 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	899 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	900 \n\
16856c9514e0 Small function call optimization and special build option for call stats. Jeremy Hylton <jeremy@alum.mit.edu> parents: 27156 diff changeset	901 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	902 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	903 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	904 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	905 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	906 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	907 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	908 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	909 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	910 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	911 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	912 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	913 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	914 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	915 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	916 );
15487 f0ca4c67957b _getframe(): New sys module function for getting at the stack frame. Barry Warsaw <barry@python.org> parents: 14375 diff changeset	917
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	918 #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	919 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	920 #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	921
3585 4ed09a3c3201 TRACE_REFS -> Py_TRACE_REFS Guido van Rossum <guido@python.org> parents: 3490 diff changeset	922 #ifdef Py_TRACE_REFS
3609 0b0c4ed1936a rename printrefs, getobjects to _Py_ prefix Guido van Rossum <guido@python.org> parents: 3585 diff changeset	923 /* 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	924 extern PyObject _Py_GetObjects(PyObject , PyObject *);
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	925 #endif
3609 0b0c4ed1936a rename printrefs, getobjects to _Py_ prefix Guido van Rossum <guido@python.org> parents: 3585 diff changeset	926
5047 7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	927 #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	928 /* 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	929 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	930 #endif
7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	931
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	932 #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	933 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37042 diff changeset	934 #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	935
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	936 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	937 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	938 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	939 PyType_ClearCache();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	940 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	941 }
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	942
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	943 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	944 "_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	945 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	946
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	947
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	948 static PyMethodDef sys_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	949 /* 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	950 {"callstats", (PyCFunction)PyEval_GetCallStats, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	951 callstats_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	952 {"_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	953 sys_clear_type_cache__doc__},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	954 {"_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	955 current_frames_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	956 {"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	957 {"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	958 {"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	959 {"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	960 {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	961 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	962 #ifdef HAVE_DLOPEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	963 {"getdlopenflags", (PyCFunction)sys_getdlopenflags, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	964 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	965 #endif
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	966 #ifdef COUNT_ALLOCS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	967 {"getcounts", (PyCFunction)sys_getcounts, METH_NOARGS},
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	968 #endif
5047 7a9cac7cb910 Added optional interface for dynamic execution profile (to be gathered Guido van Rossum <guido@python.org> parents: 4904 diff changeset	969 #ifdef DYNAMIC_EXECUTION_PROFILE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	970 {"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	971 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	972 {"getfilesystemencoding", (PyCFunction)sys_getfilesystemencoding,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	973 METH_NOARGS, getfilesystemencoding_doc},
3585 4ed09a3c3201 TRACE_REFS -> Py_TRACE_REFS Guido van Rossum <guido@python.org> parents: 3490 diff changeset	974 #ifdef Py_TRACE_REFS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	975 {"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	976 #endif
fdf80e04e4bb Rearranged and added comments to object.h, to clarify many things Tim Peters <tim.peters@gmail.com> parents: 24071 diff changeset	977 #ifdef Py_REF_DEBUG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	978 {"gettotalrefcount", (PyCFunction)sys_gettotalrefcount, METH_NOARGS},
3024 54aa87b1ccee Implemented two new functions in sys: Sjoerd Mullender <sjoerd@acm.org> parents: 2810 diff changeset	979 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	980 {"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	981 {"getrecursionlimit", (PyCFunction)sys_getrecursionlimit, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	982 getrecursionlimit_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	983 {"getsizeof", (PyCFunction)sys_getsizeof,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	984 METH_VARARGS \| METH_KEYWORDS, getsizeof_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	985 {"_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	986 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	987 {"getwindowsversion", (PyCFunction)sys_getwindowsversion, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	988 getwindowsversion_doc},
25666 4a825b902310 Add os.path.supports_unicode_filenames for all platforms, Mark Hammond <mhammond@skippinet.com.au> parents: 25108 diff changeset	989 #endif /* MS_WINDOWS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	990 {"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	991 #ifdef USE_MALLOPT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	992 {"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	993 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	994 {"setcheckinterval", sys_setcheckinterval, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	995 setcheckinterval_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	996 {"getcheckinterval", sys_getcheckinterval, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	997 getcheckinterval_doc},
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	998 #ifdef WITH_THREAD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	999 {"setswitchinterval", sys_setswitchinterval, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1000 setswitchinterval_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1001 {"getswitchinterval", sys_getswitchinterval, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1002 getswitchinterval_doc},
57175 fdd6484f1210 Merge in the new GIL. Antoine Pitrou <solipsis@pitrou.net> parents: 55611 diff changeset	1003 #endif
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18326 diff changeset	1004 #ifdef HAVE_DLOPEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1005 {"setdlopenflags", sys_setdlopenflags, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1006 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	1007 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1008 {"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	1009 {"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	1010 {"setrecursionlimit", sys_setrecursionlimit, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1011 setrecursionlimit_doc},
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	1012 #ifdef WITH_TSC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1013 {"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	1014 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1015 {"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	1016 {"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	1017 {"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	1018 {NULL, NULL} /* sentinel */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1019 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1020
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	1021 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1022 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	1023 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1024 PyObject *list = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1025 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1026 if (list == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1027 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1028 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	1029 PyObject *name = PyUnicode_FromString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1030 PyImport_Inittab[i].name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1031 if (name == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1032 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1033 PyList_Append(list, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1034 Py_DECREF(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1035 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1036 if (PyList_Sort(list) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1037 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1038 list = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1039 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1040 if (list) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1041 PyObject *v = PyList_AsTuple(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1042 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1043 list = v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1044 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1045 return list;
1198 2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1046 }
2937897a7d8b * Added Fixcprt.py: script to fix copyright message. Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1047
15595 0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1048 static PyObject *warnoptions = NULL;
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1049
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1050 void
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1051 PySys_ResetWarnOptions(void)
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1052 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1053 if (warnoptions == NULL \|\| !PyList_Check(warnoptions))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1054 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1055 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	1056 }
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1057
0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1058 void
61751 b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1059 PySys_AddWarnOptionUnicode(PyObject *unicode)
15595 0f42f6669e80 Add definitions for PySys_ResetWarnOptions() and Guido van Rossum <guido@python.org> parents: 15487 diff changeset	1060 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1061 if (warnoptions == NULL \|\| !PyList_Check(warnoptions)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1062 Py_XDECREF(warnoptions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1063 warnoptions = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1064 if (warnoptions == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1065 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1066 }
61751 b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1067 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	1068 }
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1069
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1070 void
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1071 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	1072 {
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1073 PyObject *unicode;
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1074 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	1075 if (unicode == NULL)
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1076 return;
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1077 PySys_AddWarnOptionUnicode(unicode);
b7f71f60437b Issue #8589: Decode PYTHONWARNINGS environment variable with the file system Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1078 Py_DECREF(unicode);
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
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	1081 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	1082 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	1083 {
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	1084 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	1085 }
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	1086
65575 0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1087 static PyObject *xoptions = NULL;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1088
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1089 static PyObject *
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1090 get_xoptions(void)
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1091 {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1092 if (xoptions == NULL \|\| !PyDict_Check(xoptions)) {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1093 Py_XDECREF(xoptions);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1094 xoptions = PyDict_New();
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1095 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1096 return xoptions;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1097 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1098
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1099 void
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1100 PySys_AddXOption(const wchar_t *s)
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1101 {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1102 PyObject *opts;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1103 PyObject name = NULL, value = NULL;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1104 const wchar_t *name_end;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1105 int r;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1106
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1107 opts = get_xoptions();
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1108 if (opts == NULL)
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1109 goto error;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1110
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1111 name_end = wcschr(s, L'=');
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1112 if (!name_end) {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1113 name = PyUnicode_FromWideChar(s, -1);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1114 value = Py_True;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1115 Py_INCREF(value);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1116 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1117 else {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1118 name = PyUnicode_FromWideChar(s, name_end - s);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1119 value = PyUnicode_FromWideChar(name_end + 1, -1);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1120 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1121 if (name == NULL \|\| value == NULL)
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1122 goto error;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1123 r = PyDict_SetItem(opts, name, value);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1124 Py_DECREF(name);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1125 Py_DECREF(value);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1126 return;
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1127
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1128 error:
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1129 Py_XDECREF(name);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1130 Py_XDECREF(value);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1131 /* No return value, therefore clear error state if possible */
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1132 if (_Py_atomic_load_relaxed(&_PyThreadState_Current))
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1133 PyErr_Clear();
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1134 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1135
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1136 PyObject *
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1137 PySys_GetXOptions(void)
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1138 {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1139 return get_xoptions();
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1140 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1141
8840 44baef8ab5c8 Gack. The module doc string is too long for VC++ 5.0. Guido van Rossum <guido@python.org> parents: 8566 diff changeset	1142 /* 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	1143 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	1144 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	1145 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	1146 PyDoc_VAR(sys_doc) =
43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1147 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	1148 "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	1149 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	1150 \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	1151 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	1152 \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	1153 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	1154 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	1155 modules -- dictionary of loaded modules\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1156 \n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1157 displayhook -- called to show results in an interactive session\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1158 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	1159 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	1160 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	1161 \n\
48470 3d868254ff7e correct docstring Benjamin Peterson <benjamin@python.org> parents: 48467 diff changeset	1162 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	1163 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	1164 stderr -- standard error object; used for error messages\n\
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1165 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	1166 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	1167 \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	1168 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	1169 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	1170 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	1171 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	1172 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	1173 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1174 )
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1175 /* concatenating string here */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1176 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	1177 "\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	1178 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	1179 \n\
44311 303727c58b51 Fixed #1630 Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1180 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	1181 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	1182 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	1183 maxunicode -- the largest supported character\n\
21833 070d392042e3 Fix spelling mistakes. Bugfix candidates. Neal Norwitz <nnorwitz@gmail.com> parents: 21712 diff changeset	1184 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	1185 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	1186 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	1187 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	1188 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	1189 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	1190 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	1191 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	1192 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	1193 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	1194 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	1195 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1196 )
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1197 #ifdef MS_WINDOWS
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1198 /* concatenating string here */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1199 PyDoc_STR(
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1200 "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	1201 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	1202 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1203 )
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1204 #endif /* MS_WINDOWS */
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1205 PyDoc_STR(
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1206 "__stdin__ -- the original stdin; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1207 __stdout__ -- the original stdout; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1208 __stderr__ -- the original stderr; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1209 __displayhook__ -- the original displayhook; don't touch!\n\
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 15846 diff changeset	1210 __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	1211 \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	1212 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	1213 \n\
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44086 diff changeset	1214 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	1215 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	1216 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	1217 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	1218 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	1219 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	1220 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	1221 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	1222 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	1223 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	1224 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	1225 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	1226 setprofile() -- set the global profiling function\n\
14308 b8b3f76ffd51 add user-modifiable recursion_limit Jeremy Hylton <jeremy@alum.mit.edu> parents: 14295 diff changeset	1227 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	1228 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	1229 "
23746 43ddcdcd3c71 Patch #505375: Make doc strings optional. Martin v. Löwis <martin@v.loewis.de> parents: 22604 diff changeset	1230 )
13971 aa4202702252 The attempt to protect against MS_WIN16 compilers that do not support long Fred Drake <fdrake@acm.org> parents: 13968 diff changeset	1231 /* 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	1232
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1233 /* 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	1234 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	1235 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	1236 static int svn_initialized;
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1237 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	1238 static char branch[50];
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1239 static char shortbranch[50];
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1240 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	1241
36212 cee05980f1fd svnversion_init(): Use standard layout for function defn. Tim Peters <tim.peters@gmail.com> parents: 36211 diff changeset	1242 static void
cee05980f1fd svnversion_init(): Use standard layout for function defn. Tim Peters <tim.peters@gmail.com> parents: 36211 diff changeset	1243 svnversion_init(void)
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1244 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1245 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	1246 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1247 int istag = 0;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1248
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1249 if (svn_initialized)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1250 return;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1251
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1252 python = strstr(headurl, "/python/");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1253 if (!python) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1254 strcpy(branch, "unknown branch");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1255 strcpy(shortbranch, "unknown");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1256 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1257 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1258 br_start = python + 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1259 br_end = strchr(br_start, '/');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1260 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	1261
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1262 /* Works even for trunk,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1263 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	1264 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	1265
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1266 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	1267 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	1268 strcpy(branch, "trunk");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1269 strcpy(shortbranch, "trunk");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1270 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1271 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	1272 len = br_end2 - br_start;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1273 strncpy(branch, br_start, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1274 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	1275
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1276 len = br_end2 - (br_end + 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1277 strncpy(shortbranch, br_end + 1, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1278 shortbranch[len] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1279 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1280 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1281 Py_FatalError("bad HeadURL");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1282 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1283 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1284 }
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1285
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1286
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1287 svnversion = _Py_svnversion();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1288 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	1289 svn_revision = svnversion;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1290 else if (istag) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1291 len = strlen(_patchlevel_revision);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1292 assert(len >= 13);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1293 assert(len < (sizeof(patchlevel_revision) + 13));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1294 strncpy(patchlevel_revision, _patchlevel_revision + 11,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1295 len - 13);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1296 patchlevel_revision[len - 13] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1297 svn_revision = patchlevel_revision;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1298 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1299 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1300 svn_revision = "";
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	1301
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1302 svn_initialized = 1;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1303 }
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1304
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1305 /* 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	1306 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	1307 Else return empty string */
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1308 const char*
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1309 Py_SubversionRevision()
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1310 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1311 svnversion_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1312 return svn_revision;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1313 }
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1314
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1315 const char*
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1316 Py_SubversionShortBranch()
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1317 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1318 svnversion_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1319 return shortbranch;
36207 825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1320 }
825a041813fb Drop sys.build_number. Add sys.subversion. Martin v. Löwis <martin@v.loewis.de> parents: 36070 diff changeset	1321
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1322
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1323 PyDoc_STRVAR(flags__doc__,
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1324 "sys.flags\n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1325 \n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1326 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	1327
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1328 static PyTypeObject FlagsType;
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1329
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1330 static PyStructSequence_Field flags_fields[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1331 {"debug", "-d"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1332 {"division_warning", "-Q"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1333 {"inspect", "-i"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1334 {"interactive", "-i"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1335 {"optimize", "-O or -OO"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1336 {"dont_write_bytecode", "-B"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1337 {"no_user_site", "-s"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1338 {"no_site", "-S"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1339 {"ignore_environment", "-E"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1340 {"verbose", "-v"},
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1341 #ifdef RISCOS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1342 {"riscos_wimp", "???"},
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1343 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1344 /* {"unbuffered", "-u"}, */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1345 /* {"skip_first", "-x"}, */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1346 {"bytes_warning", "-b"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1347 {0}
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1348 };
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1349
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1350 static PyStructSequence_Desc flags_desc = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1351 "sys.flags", /* name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1352 flags__doc__, /* doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1353 flags_fields, /* fields */
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1354 #ifdef RISCOS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1355 12
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1356 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1357 11
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1358 #endif
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1359 };
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1360
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1361 static PyObject*
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1362 make_flags(void)
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1363 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1364 int pos = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1365 PyObject *seq;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1366
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1367 seq = PyStructSequence_New(&FlagsType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1368 if (seq == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1369 return NULL;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1370
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1371 #define SetFlag(flag) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1372 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	1373
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1374 SetFlag(Py_DebugFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1375 SetFlag(Py_DivisionWarningFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1376 SetFlag(Py_InspectFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1377 SetFlag(Py_InteractiveFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1378 SetFlag(Py_OptimizeFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1379 SetFlag(Py_DontWriteBytecodeFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1380 SetFlag(Py_NoUserSiteDirectory);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1381 SetFlag(Py_NoSiteFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1382 SetFlag(Py_IgnoreEnvironmentFlag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1383 SetFlag(Py_VerboseFlag);
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1384 #ifdef RISCOS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1385 SetFlag(Py_RISCOSWimpFlag);
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1386 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1387 /* SetFlag(saw_unbuffered_flag); */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1388 /* 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	1389 SetFlag(Py_BytesWarningFlag);
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1390 #undef SetFlag
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1391
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1392 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1393 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1394 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1395 return seq;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1396 }
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1397
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1398 PyDoc_STRVAR(version_info__doc__,
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1399 "sys.version_info\n\
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1400 \n\
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1401 Version information as a named tuple.");
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1402
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1403 static PyTypeObject VersionInfoType;
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1404
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1405 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	1406 {"major", "Major release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1407 {"minor", "Minor release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1408 {"micro", "Patch release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1409 {"releaselevel", "'alpha', 'beta', 'candidate', or 'release'"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1410 {"serial", "Serial release number"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1411 {0}
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1412 };
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1413
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1414 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	1415 "sys.version_info", /* name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1416 version_info__doc__, /* doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1417 version_info_fields, /* fields */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1418 5
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1419 };
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1420
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1421 static PyObject *
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1422 make_version_info(void)
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1423 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1424 PyObject *version_info;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1425 char *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1426 int pos = 0;
51378 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 version_info = PyStructSequence_New(&VersionInfoType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1429 if (version_info == NULL) {
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 }
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1432
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1433 /*
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1434 * 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	1435 * 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	1436 */
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1437 #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	1438 s = "alpha";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1439 #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	1440 s = "beta";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1441 #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	1442 s = "candidate";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1443 #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	1444 s = "final";
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1445 #endif
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1446
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1447 #define SetIntItem(flag) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1448 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	1449 #define SetStrItem(flag) \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1450 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	1451
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1452 SetIntItem(PY_MAJOR_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1453 SetIntItem(PY_MINOR_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1454 SetIntItem(PY_MICRO_VERSION);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1455 SetStrItem(s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1456 SetIntItem(PY_RELEASE_SERIAL);
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1457 #undef SetIntItem
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1458 #undef SetStrItem
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1459
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1460 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1461 Py_CLEAR(version_info);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1462 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1463 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1464 return version_info;
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1465 }
4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1466
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47489 diff changeset	1467 static struct PyModuleDef sysmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1468 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1469 "sys",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1470 sys_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1471 -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	1472 sys_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1473 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1474 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1475 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1476 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47489 diff changeset	1477 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47489 diff changeset	1478
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5863 diff changeset	1479 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1480 _PySys_Init(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1481 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1482 PyObject m, v, *sysdict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1483 char *s;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5863 diff changeset	1484
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1485 m = PyModule_Create(&sysmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1486 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1487 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1488 sysdict = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1489 #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	1490 v = value; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1491 if (v != NULL) \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1492 PyDict_SetItemString(sysdict, key, v); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1493 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	1494
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1495 /* 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	1496 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	1497 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	1498 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	1499 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	1500 #if !defined(MS_WINDOWS)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1501 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1502 struct stat sb;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1503 if (fstat(fileno(stdin), &sb) == 0 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1504 S_ISDIR(sb.st_mode)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1505 /* 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	1506 /* 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	1507 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	1508 exit(EXIT_FAILURE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1509 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1510 }
50743 e8154bd322cb Merged revisions 68540 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	1511 #endif
35673 612a12178e47 SF bug #887946, segfault if redirecting directory Neal Norwitz <nnorwitz@gmail.com> parents: 35572 diff changeset	1512
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1513 /* 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	1514
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1515 PyDict_SetItemString(sysdict, "__displayhook__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1516 PyDict_GetItemString(sysdict, "displayhook"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1517 PyDict_SetItemString(sysdict, "__excepthook__",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1518 PyDict_GetItemString(sysdict, "excepthook"));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1519 SET_SYS_FROM_STRING("version",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1520 PyUnicode_FromString(Py_GetVersion()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1521 SET_SYS_FROM_STRING("hexversion",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1522 PyLong_FromLong(PY_VERSION_HEX));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1523 svnversion_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1524 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	1525 Py_BuildValue("(sss)", "CPython", branch,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1526 svn_revision));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1527 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	1528 PyBool_FromLong(Py_DontWriteBytecodeFlag));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1529 SET_SYS_FROM_STRING("api_version",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1530 PyLong_FromLong(PYTHON_API_VERSION));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1531 SET_SYS_FROM_STRING("copyright",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1532 PyUnicode_FromString(Py_GetCopyright()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1533 SET_SYS_FROM_STRING("platform",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1534 PyUnicode_FromString(Py_GetPlatform()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1535 SET_SYS_FROM_STRING("executable",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1536 PyUnicode_FromWideChar(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1537 Py_GetProgramFullPath(), -1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1538 SET_SYS_FROM_STRING("prefix",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1539 PyUnicode_FromWideChar(Py_GetPrefix(), -1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1540 SET_SYS_FROM_STRING("exec_prefix",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1541 PyUnicode_FromWideChar(Py_GetExecPrefix(), -1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1542 SET_SYS_FROM_STRING("maxsize",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1543 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	1544 SET_SYS_FROM_STRING("float_info",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1545 PyFloat_GetInfo());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1546 SET_SYS_FROM_STRING("int_info",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1547 PyLong_GetInfo());
61873 0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1548 /* initialize hash_info */
0bc8ffe6ba9a Issue #8188: Introduce a new scheme for computing hashes of numbers Mark Dickinson <dickinsm@gmail.com> parents: 61790 diff changeset	1549 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	1550 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	1551 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	1552 get_hash_info());
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1553 SET_SYS_FROM_STRING("maxunicode",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1554 PyLong_FromLong(PyUnicode_GetMax()));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1555 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	1556 list_builtin_module_names());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1557 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1558 /* 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	1559 Should be safe! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1560 unsigned long number = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1561 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	1562
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1563 s = (char *) &number;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1564 if (s[0] == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1565 value = "big";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1566 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1567 value = "little";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1568 SET_SYS_FROM_STRING("byteorder",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1569 PyUnicode_FromString(value));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1570 }
4126 c80c515999b9 Use MS_DLL_ID as sys.winver Guido van Rossum <guido@python.org> parents: 3877 diff changeset	1571 #ifdef MS_COREDLL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1572 SET_SYS_FROM_STRING("dllhandle",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1573 PyLong_FromVoidPtr(PyWin_DLLhModule));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1574 SET_SYS_FROM_STRING("winver",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1575 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	1576 #endif
65389 932f97bfbdc0 First (uncontroversial) part of issue 9807. Barry Warsaw <barry@python.org> parents: 65166 diff changeset	1577 #ifdef ABIFLAGS
932f97bfbdc0 First (uncontroversial) part of issue 9807. Barry Warsaw <barry@python.org> parents: 65166 diff changeset	1578 SET_SYS_FROM_STRING("abiflags",
932f97bfbdc0 First (uncontroversial) part of issue 9807. Barry Warsaw <barry@python.org> parents: 65166 diff changeset	1579 PyUnicode_FromString(ABIFLAGS));
932f97bfbdc0 First (uncontroversial) part of issue 9807. Barry Warsaw <barry@python.org> parents: 65166 diff changeset	1580 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1581 if (warnoptions == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1582 warnoptions = PyList_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1583 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1584 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1585 Py_INCREF(warnoptions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1586 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1587 if (warnoptions != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1588 PyDict_SetItemString(sysdict, "warnoptions", warnoptions);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1589 }
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	1590
65575 0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1591 v = get_xoptions();
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1592 if (v != NULL) {
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1593 PyDict_SetItemString(sysdict, "_xoptions", v);
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1594 }
0b5bfba7a907 Issue #10089: Add support for arbitrary -X options on the command-line. Antoine Pitrou <solipsis@pitrou.net> parents: 65494 diff changeset	1595
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1596 /* version_info */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1597 if (VersionInfoType.tp_name == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1598 PyStructSequence_InitType(&VersionInfoType, &version_info_desc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1599 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	1600 /* prevent user from creating new instances */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1601 VersionInfoType.tp_init = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1602 VersionInfoType.tp_new = NULL;
51378 4cc49d978ec2 Merged revisions 69331 via svnmerge from Eric Smith <eric@trueblade.com> parents: 50743 diff changeset	1603
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1604 /* flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1605 if (FlagsType.tp_name == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1606 PyStructSequence_InitType(&FlagsType, &flags_desc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1607 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	1608 /* prevent user from creating new instances */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1609 FlagsType.tp_init = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1610 FlagsType.tp_new = NULL;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1611
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1612
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1613 #if defined(MS_WINDOWS)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1614 /* getwindowsversion */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1615 if (WindowsVersionType.tp_name == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1616 PyStructSequence_InitType(&WindowsVersionType, &windows_version_desc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1617 /* prevent user from creating new instances */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1618 WindowsVersionType.tp_init = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1619 WindowsVersionType.tp_new = NULL;
58507 7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1620 #endif
7379cf70fd60 Merged revisions 77763 via svnmerge from Eric Smith <eric@trueblade.com> parents: 57181 diff changeset	1621
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1622 /* 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	1623 #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	1624 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	1625 PyUnicode_FromString("short"));
53185 97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1626 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1627 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	1628 PyUnicode_FromString("legacy"));
53185 97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1629 #endif
97ae7a709c1d Issue #1580: use short float repr where possible. Mark Dickinson <dickinsm@gmail.com> parents: 52215 diff changeset	1630
45071 f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	1631 #undef SET_SYS_FROM_STRING
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1632 if (PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1633 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1634 return m;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1635 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1636
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	1637 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	1638 makepathobject(const wchar_t *path, wchar_t delim)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1639 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1640 int i, n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1641 const wchar_t *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1642 PyObject v, w;
36211 6d743e5baf14 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 36207 diff changeset	1643
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1644 n = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1645 p = path;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1646 while ((p = wcschr(p, delim)) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1647 n++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1648 p++;
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 v = PyList_New(n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1651 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1652 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1653 for (i = 0; ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1654 p = wcschr(path, delim);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1655 if (p == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1656 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	1657 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	1658 if (w == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1659 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1660 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1661 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1662 PyList_SetItem(v, i, w);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1663 if (*p == '\0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1664 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1665 path = p+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1666 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1667 return v;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1668 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1669
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1670 void
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 45145 diff changeset	1671 PySys_SetPath(const wchar_t *path)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 83 diff changeset	1672 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1673 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1674 if ((v = makepathobject(path, DELIM)) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1675 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	1676 if (PySys_SetObject("path", v) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1677 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	1678 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	1679 }
f6bcf3c1d714 Empty all modules' symbol tables, so most circular references are Guido van Rossum <guido@python.org> parents: 6 diff changeset	1680
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5340 diff changeset	1681 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	1682 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	1683 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1684 PyObject *av;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1685 if (argc <= 0 \|\| argv == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1686 /* 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	1687 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	1688 argv = empty_argv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1689 argc = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1690 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1691 av = PyList_New(argc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1692 if (av != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1693 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1694 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	1695 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1696 PyObject *v;
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28556 diff changeset	1697
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1698 /* 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	1699 if (i == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1700 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	1701 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	1702 v = PyUnicode_FromString(argv[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1703 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1704 v = PyUnicode_FromString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1705 decc$translate_vms(argv[0]));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1706 } else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1707 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	1708 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1709 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	1710 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1711 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1712 Py_DECREF(av);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1713 av = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1714 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1715 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1716 PyList_SetItem(av, i, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1717 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1718 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1719 return av;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1720 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1721
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	1722 #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	1723 (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	1724 wcscmp(argv0, L"-c") != 0 && wcscmp(argv0, L"-m") != 0)
65154 62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1725
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1726 static void
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1727 sys_update_path(int argc, wchar_t **argv)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1728 {
65154 62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1729 wchar_t *argv0;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1730 wchar_t *p = NULL;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1731 Py_ssize_t n = 0;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1732 PyObject *a;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1733 PyObject *path;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1734 #ifdef HAVE_READLINK
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1735 wchar_t link[MAXPATHLEN+1];
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1736 wchar_t argv0copy[2*MAXPATHLEN+1];
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1737 int nr = 0;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1738 #endif
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	1739 #if defined(HAVE_REALPATH)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1740 wchar_t fullpath[MAXPATHLEN];
50743 e8154bd322cb Merged revisions 68540 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	1741 #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	1742 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	1743 #endif
65154 62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1744
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1745 path = PySys_GetObject("path");
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1746 if (path == NULL)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1747 return;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1748
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1749 argv0 = argv[0];
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1750
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1751 #ifdef HAVE_READLINK
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1752 if (_HAVE_SCRIPT_ARGUMENT(argc, argv))
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1753 nr = _Py_wreadlink(argv0, link, MAXPATHLEN);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1754 if (nr > 0) {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1755 /* It's a symlink */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1756 link[nr] = '\0';
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1757 if (link[0] == SEP)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1758 argv0 = link; /* Link to absolute path */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1759 else if (wcschr(link, SEP) == NULL)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1760 ; /* Link without path */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1761 else {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1762 /* Must join(dirname(argv0), link) */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1763 wchar_t *q = wcsrchr(argv0, SEP);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1764 if (q == NULL)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1765 argv0 = link; /* argv0 without path */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1766 else {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1767 /* Must make a copy */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1768 wcscpy(argv0copy, argv0);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1769 q = wcsrchr(argv0copy, SEP);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1770 wcscpy(q+1, link);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1771 argv0 = argv0copy;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1772 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1773 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1774 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1775 #endif /* HAVE_READLINK */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1776 #if SEP == '\\' /* Special case for MS filename syntax */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1777 if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1778 wchar_t *q;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1779 #if defined(MS_WINDOWS) && !defined(MS_WINCE)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1780 /* This code here replaces the first element in argv with the full
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1781 path that it represents. Under CE, there are no relative paths so
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1782 the argument must be the full path anyway. */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1783 wchar_t *ptemp;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1784 if (GetFullPathNameW(argv0,
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1785 sizeof(fullpath)/sizeof(fullpath[0]),
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1786 fullpath,
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1787 &ptemp)) {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1788 argv0 = fullpath;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1789 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1790 #endif
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1791 p = wcsrchr(argv0, SEP);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1792 /* Test for alternate separator */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1793 q = wcsrchr(p ? p : argv0, '/');
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1794 if (q != NULL)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1795 p = q;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1796 if (p != NULL) {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1797 n = p + 1 - argv0;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1798 if (n > 1 && p[-1] != ':')
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1799 n--; /* Drop trailing separator */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1800 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1801 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1802 #else /* All other filename syntaxes */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1803 if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1804 #if defined(HAVE_REALPATH)
65166 8fd5d06462e6 _Py_wrealpath() requires the size of the output buffer Victor Stinner <victor.stinner@haypocalc.com> parents: 65162 diff changeset	1805 if (_Py_wrealpath(argv0, fullpath, PATH_MAX)) {
65154 62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1806 argv0 = fullpath;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1807 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1808 #endif
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1809 p = wcsrchr(argv0, SEP);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1810 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1811 if (p != NULL) {
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1812 n = p + 1 - argv0;
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1813 #if SEP == '/' /* Special case for Unix filename syntax */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1814 if (n > 1)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1815 n--; /* Drop trailing separator */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1816 #endif /* Unix */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1817 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1818 #endif /* All others */
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1819 a = PyUnicode_FromWideChar(argv0, n);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1820 if (a == NULL)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1821 Py_FatalError("no mem for sys.path insertion");
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1822 if (PyList_Insert(path, 0, a) < 0)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1823 Py_FatalError("sys.path.insert(0) failed");
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1824 Py_DECREF(a);
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1825 }
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1826
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1827 void
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1828 PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1829 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1830 PyObject *av = makeargvobject(argc, argv);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1831 if (av == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1832 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	1833 if (PySys_SetObject("argv", av) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1834 Py_FatalError("can't assign sys.argv");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1835 Py_DECREF(av);
65154 62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1836 if (updatepath)
62c58dc912e8 Create a subfunction for PySys_SetArgvEx() Victor Stinner <victor.stinner@haypocalc.com> parents: 64622 diff changeset	1837 sys_update_path(argc, argv);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1838 }
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	1839
61790 795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1840 void
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1841 PySys_SetArgv(int argc, wchar_t **argv)
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1842 {
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1843 PySys_SetArgvEx(argc, argv, 1);
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1844 }
795762b5e0d6 Merged revisions 81398 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61751 diff changeset	1845
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1846 /* 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	1847 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	1848
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1849 static int
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1850 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	1851 {
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1852 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	1853 int err;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1854
62189 d281ed59ff0b sys_pyfile_write() does nothing if file is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 62155 diff changeset	1855 if (file == NULL)
d281ed59ff0b sys_pyfile_write() does nothing if file is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 62155 diff changeset	1856 return -1;
d281ed59ff0b sys_pyfile_write() does nothing if file is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 62155 diff changeset	1857
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1858 writer = PyObject_GetAttrString(file, "write");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1859 if (writer == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1860 goto error;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1861
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1862 args = PyTuple_Pack(1, unicode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1863 if (args == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1864 goto error;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1865
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1866 result = PyEval_CallObject(writer, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1867 if (result == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1868 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1869 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1870 err = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1871 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1872 }
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1873
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1874 error:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1875 err = -1;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1876 finally:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1877 Py_XDECREF(writer);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1878 Py_XDECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1879 Py_XDECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1880 return err;
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1881 }
86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1882
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1883 static int
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1884 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	1885 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1886 PyObject *unicode = NULL;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1887 int err;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1888
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1889 if (file == NULL)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1890 return -1;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1891
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1892 unicode = PyUnicode_FromString(text);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1893 if (unicode == NULL)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1894 return -1;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1895
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1896 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	1897 Py_DECREF(unicode);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1898 return err;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1899 }
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	1900
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	1901 /* 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	1902 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	1903
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	1904 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	1905 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	1906
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 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	1908 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	1909 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	1910
60889 86fadaebcf66 Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute Victor Stinner <victor.stinner@haypocalc.com> parents: 59300 diff changeset	1911 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	1912 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	1913 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	1914
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	1915 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	1916 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	1917
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	1918 * 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	1919
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	1920 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	1921 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	1922 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	1923 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	1924 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	1925 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	1926
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 */
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	1928
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	1929 static void
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1930 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	1931 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1932 PyObject *file;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1933 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	1934 char buffer[1001];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1935 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	1936
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1937 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	1938 file = PySys_GetObject(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1939 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	1940 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	1941 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1942 fputs(buffer, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1943 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1944 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	1945 const char *truncated = "... truncated";
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1946 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	1947 fputs(truncated, fp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1948 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1949 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	1950 }
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	1951
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	1952 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	1953 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	1954 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1955 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	1956
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1957 va_start(va, format);
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1958 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	1959 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	1960 }
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	1961
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	1962 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	1963 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	1964 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1965 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	1966
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60889 diff changeset	1967 va_start(va, format);
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1968 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	1969 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	1970 }
64064 5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1971
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1972 static void
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1973 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	1974 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1975 PyObject file, message;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1976 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	1977 char *utf8;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1978
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1979 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	1980 file = PySys_GetObject(name);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1981 message = PyUnicode_FromFormatV(format, va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1982 if (message != NULL) {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1983 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	1984 PyErr_Clear();
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1985 utf8 = _PyUnicode_AsString(message);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1986 if (utf8 != NULL)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1987 fputs(utf8, fp);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1988 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1989 Py_DECREF(message);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1990 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1991 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	1992 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1993
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1994 void
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1995 PySys_FormatStdout(const char *format, ...)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1996 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1997 va_list va;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1998
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	1999 va_start(va, format);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2000 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	2001 va_end(va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2002 }
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2003
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2004 void
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2005 PySys_FormatStderr(const char *format, ...)
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2006 {
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2007 va_list va;
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2008
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2009 va_start(va, format);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2010 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	2011 va_end(va);
5d9bdf5aa07b Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() Victor Stinner <victor.stinner@haypocalc.com> parents: 62828 diff changeset	2012 }

Mercurial > cpython-lru_cache-weakref

annotate Python/sysmodule.c @ 66556:724920a015f7