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

annotate Python/pythonrun.c @ 36683:da2a1049215d legacy-trunk

Patch 1413181, by Gabriel Becedillas. PyThreadState_Delete(): if the auto-GIL-state machinery knows about the thread state, forget it (since the thread state is being deleted, continuing to remember it can't help, but can hurt if another thread happens to get created with the same thread id). I'll backport to 2.4 next.

author	Tim Peters <tim.peters@gmail.com>
date	Mon, 27 Feb 2006 17:15:31 +0000
parents	2ab9270ef19a
children	bbf16fd024df

rev	line source
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Python interpreter top-level routines, including init/exit */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	3
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	4 #include "Python.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	5
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	6 #include "Python-ast.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	7 #include "grammar.h"
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "node.h"
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	9 #include "token.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	10 #include "parsetok.h"
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	11 #include "errcode.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	12 #include "code.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	13 #include "compile.h"
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	14 #include "symtable.h"
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	15 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	16 #include "ast.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	17 #include "eval.h"
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	18 #include "marshal.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	19
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	20 #include <signal.h>
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	21
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	22 #ifdef HAVE_LANGINFO_H
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	23 #include <locale.h>
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	24 #include <langinfo.h>
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	25 #endif
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	26
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23252 diff changeset	27 #ifdef MS_WINDOWS
2529 16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	28 #undef BYTE
16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	29 #include "windows.h"
16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	30 #endif
16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	31
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	32 extern char *Py_GetPath(void);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	33
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	34 extern grammar _PyParser_Grammar; /* From graminit.c */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	35
1391 7c3245c18677 * ceval.c, longobject.c, methodobject.c, listnode.c, arraymodule.c, Guido van Rossum <guido@python.org> parents: 1347 diff changeset	36 /* Forward */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	37 static void initmain(void);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	38 static void initsite(void);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	39 static PyObject run_err_mod(mod_ty, const char , PyObject , PyObject ,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	40 PyCompilerFlags , PyArena arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	41 static PyObject run_mod(mod_ty, const char , PyObject , PyObject ,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	42 PyCompilerFlags , PyArena );
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	43 static PyObject run_pyc_file(FILE , const char , PyObject , PyObject *,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	44 PyCompilerFlags *);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	45 static void err_input(perrdetail *);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	46 static void initsigs(void);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	47 static void call_sys_exitfunc(void);
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	48 static void call_ll_exitfuncs(void);
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	49 extern void _PyUnicode_Init(void);
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	50 extern void _PyUnicode_Fini(void);
11977 8b88e1bc0e1b Marc-Andre Lemburg: add calls to initialize and finalize Unicode and Guido van Rossum <guido@python.org> parents: 11673 diff changeset	51
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	52 #ifdef WITH_THREAD
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	53 extern void _PyGILState_Init(PyInterpreterState , PyThreadState );
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	54 extern void _PyGILState_Fini(void);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	55 #endif /* WITH_THREAD */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	56
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	57 int Py_DebugFlag; /* Needed by parser.c */
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	58 int Py_VerboseFlag; /* Needed by import.c */
5108 a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	59 int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	60 int Py_NoSiteFlag; /* Suppress 'import site' */
12555 04cf788d862b Py_UseClassExceptionsFlag is deprecated. We keep the C variable for C Barry Warsaw <barry@python.org> parents: 12539 diff changeset	61 int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	62 int Py_FrozenFlag; /* Needed by getpath.c */
12539 d7484a743354 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12518 diff changeset	63 int Py_UnicodeFlag = 0; /* Needed by compile.c */
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	64 int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21077 diff changeset	65 /* _XXX Py_QnewFlag should go away in 2.3. It's true iff -Qnew is passed,
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21077 diff changeset	66 on the command line, and is used in 2.2 by ceval.c to make all "/" divisions
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21077 diff changeset	67 true divisions (which they will be in 2.3). */
45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21077 diff changeset	68 int _Py_QnewFlag = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	69
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 27878 diff changeset	70 /* Reference to 'warnings' module, to avoid importing it
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	71 on the fly when the import lock may be held. See 683658/771097
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	72 */
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	73 static PyObject *warnings_module = NULL;
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	74
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	75 /* Returns a borrowed reference to the 'warnings' module, or NULL.
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	76 If the module is returned, it is guaranteed to have been obtained
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	77 without acquiring the import lock
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 27878 diff changeset	78 */
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	79 PyObject *PyModule_GetWarningsModule(void)
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	80 {
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	81 PyObject typ, val, *tb;
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	82 PyObject *all_modules;
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	83 /* If we managed to get the module at init time, just use it */
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	84 if (warnings_module)
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	85 return warnings_module;
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	86 /* If it wasn't available at init time, it may be available
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	87 now in sys.modules (common scenario is frozen apps: import
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	88 at init time fails, but the frozen init code sets up sys.path
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	89 correctly, then does an implicit import of warnings for us
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	90 */
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	91 /* Save and restore any exceptions */
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	92 PyErr_Fetch(&typ, &val, &tb);
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	93
29879 ed8709b1a3ef Correct previous patch looking for warnings module: sys.modules, not Mark Hammond <mhammond@skippinet.com.au> parents: 29877 diff changeset	94 all_modules = PySys_GetObject("modules");
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	95 if (all_modules) {
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	96 warnings_module = PyDict_GetItemString(all_modules, "warnings");
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	97 /* We keep a ref in the global */
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	98 Py_XINCREF(warnings_module);
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	99 }
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	100 PyErr_Restore(typ, val, tb);
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	101 return warnings_module;
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	102 }
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 27878 diff changeset	103
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	104 static int initialized = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	105
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13552 diff changeset	106 /* API to access the initialized flag -- useful for esoteric use */
6136 57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	107
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	108 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	109 Py_IsInitialized(void)
6136 57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	110 {
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	111 return initialized;
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	112 }
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	113
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	114 /* Global initializations. Can be undone by Py_Finalize(). Don't
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	115 call this twice without an intervening Py_Finalize() call. When
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	116 initializations fail, a fatal error is issued and the function does
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	117 not return. On return, the first thread and interpreter state have
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	118 been created.
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	119
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	120 Locking: you must hold the interpreter lock while calling this.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	121 (If the lock has not yet been initialized, that's equivalent to
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	122 having the lock, but you cannot use multiple threads.)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	123
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	124 */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	125
20401 b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	126 static int
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	127 add_flag(int flag, const char *envs)
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	128 {
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	129 int env = atoi(envs);
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	130 if (flag < env)
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	131 flag = env;
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	132 if (flag < 1)
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	133 flag = 1;
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	134 return flag;
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	135 }
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	136
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	137 void
33189 de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	138 Py_InitializeEx(int install_sigs)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	139 {
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	140 PyInterpreterState *interp;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	141 PyThreadState *tstate;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	142 PyObject bimod, sysmod;
5850 6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	143 char *p;
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	144 #if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET)
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	145 char *codeset;
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	146 char *saved_locale;
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	147 PyObject sys_stream, sys_isatty;
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	148 #endif
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	149 extern void _Py_ReadyTypes(void);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	150
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	151 if (initialized)
6117 98a282cfb013 Use a counter instead of a Boolean to check for initialized; n calls Guido van Rossum <guido@python.org> parents: 5939 diff changeset	152 return;
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	153 initialized = 1;
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	154
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	155 if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
20401 b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	156 Py_DebugFlag = add_flag(Py_DebugFlag, p);
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	157 if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
20401 b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	158 Py_VerboseFlag = add_flag(Py_VerboseFlag, p);
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	159 if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
20401 b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	160 Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
5850 6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	161
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	162 interp = PyInterpreterState_New();
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	163 if (interp == NULL)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	164 Py_FatalError("Py_Initialize: can't make first interpreter");
5850 6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	165
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	166 tstate = PyThreadState_New(interp);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	167 if (tstate == NULL)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	168 Py_FatalError("Py_Initialize: can't make first thread");
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	169 (void) PyThreadState_Swap(tstate);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	170
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	171 _Py_ReadyTypes();
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 18933 diff changeset	172
26923 dbfc3ef7d003 Since the _Init() are private, prefix with _, suggested by Skip Neal Norwitz <nnorwitz@gmail.com>* parents: 26889 diff changeset	173 if (!_PyFrame_Init())
26889 12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	174 Py_FatalError("Py_Initialize: can't init frames");
12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	175
26923 dbfc3ef7d003 Since the _Init() are private, prefix with _, suggested by Skip Neal Norwitz <nnorwitz@gmail.com>* parents: 26889 diff changeset	176 if (!_PyInt_Init())
26889 12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	177 Py_FatalError("Py_Initialize: can't init ints");
12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	178
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34834 diff changeset	179 _PyFloat_Init();
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34834 diff changeset	180
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	181 interp->modules = PyDict_New();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	182 if (interp->modules == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	183 Py_FatalError("Py_Initialize: can't make modules dictionary");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	184
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19296 diff changeset	185 #ifdef Py_USING_UNICODE
11977 8b88e1bc0e1b Marc-Andre Lemburg: add calls to initialize and finalize Unicode and Guido van Rossum <guido@python.org> parents: 11673 diff changeset	186 /* Init Unicode implementation; relies on the codec registry */
8b88e1bc0e1b Marc-Andre Lemburg: add calls to initialize and finalize Unicode and Guido van Rossum <guido@python.org> parents: 11673 diff changeset	187 _PyUnicode_Init();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19296 diff changeset	188 #endif
11977 8b88e1bc0e1b Marc-Andre Lemburg: add calls to initialize and finalize Unicode and Guido van Rossum <guido@python.org> parents: 11673 diff changeset	189
12754 5213abfe5230 Py_Initialize(): Now that standard exceptions are builtin, we don't Barry Warsaw <barry@python.org> parents: 12576 diff changeset	190 bimod = _PyBuiltin_Init();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	191 if (bimod == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	192 Py_FatalError("Py_Initialize: can't initialize __builtin__");
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	193 interp->builtins = PyModule_GetDict(bimod);
b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	194 Py_INCREF(interp->builtins);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	195
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	196 sysmod = _PySys_Init();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	197 if (sysmod == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	198 Py_FatalError("Py_Initialize: can't initialize sys");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	199 interp->sysdict = PyModule_GetDict(sysmod);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	200 Py_INCREF(interp->sysdict);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	201 _PyImport_FixupExtension("sys", "sys");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	202 PySys_SetPath(Py_GetPath());
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	203 PyDict_SetItemString(interp->sysdict, "modules",
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	204 interp->modules);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	205
11113 be8ec828c072 Marc-Andre Lemburg discovered that the switch from .pyc to .pyo files, Guido van Rossum <guido@python.org> parents: 10534 diff changeset	206 _PyImport_Init();
be8ec828c072 Marc-Andre Lemburg discovered that the switch from .pyc to .pyo files, Guido van Rossum <guido@python.org> parents: 10534 diff changeset	207
12754 5213abfe5230 Py_Initialize(): Now that standard exceptions are builtin, we don't Barry Warsaw <barry@python.org> parents: 12576 diff changeset	208 /* initialize builtin exceptions */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18808 diff changeset	209 _PyExc_Init();
19237 e110cd4fc3c6 Py_Initialize(): Apply patch by Jürgen Hermann to call Barry Warsaw <barry@python.org> parents: 19158 diff changeset	210 _PyImport_FixupExtension("exceptions", "exceptions");
12754 5213abfe5230 Py_Initialize(): Now that standard exceptions are builtin, we don't Barry Warsaw <barry@python.org> parents: 12576 diff changeset	211
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	212 /* phase 2 of builtins */
6328 dfeaf965f48a Py_Initialize(): move the call to _PyImport_FixupExtension() to after Barry Warsaw <barry@python.org> parents: 6322 diff changeset	213 _PyImport_FixupExtension("__builtin__", "__builtin__");
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	214
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26643 diff changeset	215 _PyImportHooks_Init();
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26643 diff changeset	216
33189 de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	217 if (install_sigs)
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	218 initsigs(); /* Signal handling stuff, including initintr() */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	219
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	220 initmain(); /* Module __main__ */
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	221 if (!Py_NoSiteFlag)
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	222 initsite(); /* Module site */
28065 c61ef183ce2f Addendum to #683658: Just van Rossum <just@letterror.com> parents: 27958 diff changeset	223
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	224 /* auto-thread-state API, if available */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	225 #ifdef WITH_THREAD
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	226 _PyGILState_Init(interp, tstate);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	227 #endif /* WITH_THREAD */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	228
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	229 warnings_module = PyImport_ImportModule("warnings");
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	230 if (!warnings_module)
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	231 PyErr_Clear();
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	232
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	233 #if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET)
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	234 /* On Unix, set the file system encoding according to the
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	235 user's preference, if the CODESET names a well-known
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	236 Python codec, and Py_FileSystemDefaultEncoding isn't
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	237 initialized by other means. Also set the encoding of
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	238 stdin and stdout if these are terminals. */
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	239
30910 a29a585b03d9 Patch #804543: strdup saved locales. Backported to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	240 saved_locale = strdup(setlocale(LC_CTYPE, NULL));
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	241 setlocale(LC_CTYPE, "");
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	242 codeset = nl_langinfo(CODESET);
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	243 if (codeset && *codeset) {
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	244 PyObject *enc = PyCodec_Encoder(codeset);
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	245 if (enc) {
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	246 codeset = strdup(codeset);
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	247 Py_DECREF(enc);
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	248 } else {
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	249 codeset = NULL;
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	250 PyErr_Clear();
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	251 }
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	252 } else
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	253 codeset = NULL;
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	254 setlocale(LC_CTYPE, saved_locale);
30910 a29a585b03d9 Patch #804543: strdup saved locales. Backported to 2.3. Martin v. Löwis <martin@v.loewis.de> parents: 30683 diff changeset	255 free(saved_locale);
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	256
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	257 if (codeset) {
30122 210676ec9d5f Fix refcounting and cut & paste error (?) in last checkin. Michael W. Hudson <mwh@python.net> parents: 30108 diff changeset	258 sys_stream = PySys_GetObject("stdin");
30108 a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	259 sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	260 if (!sys_isatty)
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	261 PyErr_Clear();
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	262 if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	263 if (!PyFile_SetEncoding(sys_stream, codeset))
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	264 Py_FatalError("Cannot set codeset of stdin");
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	265 }
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	266 Py_XDECREF(sys_isatty);
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	267
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	268 sys_stream = PySys_GetObject("stdout");
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	269 sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	270 if (!sys_isatty)
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	271 PyErr_Clear();
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	272 if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	273 if (!PyFile_SetEncoding(sys_stream, codeset))
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	274 Py_FatalError("Cannot set codeset of stdout");
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	275 }
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	276 Py_XDECREF(sys_isatty);
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	277
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	278 if (!Py_FileSystemDefaultEncoding)
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	279 Py_FileSystemDefaultEncoding = codeset;
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	280 else
a88e6dfbfd6d Move initialization of sys.std{in,out}.encoding to Py_Initialize. Martin v. Löwis <martin@v.loewis.de> parents: 29879 diff changeset	281 free(codeset);
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	282 }
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	283 #endif
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	284 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	285
33189 de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	286 void
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	287 Py_Initialize(void)
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	288 {
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	289 Py_InitializeEx(1);
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	290 }
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	291
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	292
9641 d152adf3f094 Move the prototype for dump_counts() to before where it is used. Guido van Rossum <guido@python.org> parents: 9285 diff changeset	293 #ifdef COUNT_ALLOCS
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	294 extern void dump_counts(void);
9641 d152adf3f094 Move the prototype for dump_counts() to before where it is used. Guido van Rossum <guido@python.org> parents: 9285 diff changeset	295 #endif
d152adf3f094 Move the prototype for dump_counts() to before where it is used. Guido van Rossum <guido@python.org> parents: 9285 diff changeset	296
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	297 /* Undo the effect of Py_Initialize().
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	298
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	299 Beware: if multiple interpreter and/or thread states exist, these
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	300 are not wiped out; only the current thread and interpreter state
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	301 are deleted. But since everything else is deleted, those other
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	302 interpreter and thread states should no longer be used.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	303
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	304 (XXX We should do better, e.g. wipe out all interpreters and
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	305 threads.)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	306
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	307 Locking: as above.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	308
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	309 */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	310
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	311 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	312 Py_Finalize(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	313 {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	314 PyInterpreterState *interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	315 PyThreadState *tstate;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	316
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	317 if (!initialized)
6117 98a282cfb013 Use a counter instead of a Boolean to check for initialized; n calls Guido van Rossum <guido@python.org> parents: 5939 diff changeset	318 return;
16073 713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	319
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	320 /* The interpreter is still entirely intact at this point, and the
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	321 * exit funcs may be relying on that. In particular, if some thread
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	322 * or exit func is still waiting to do an import, the import machinery
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	323 * expects Py_IsInitialized() to return true. So don't say the
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	324 * interpreter is uninitialized until after the exit funcs have run.
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	325 * Note that Threading.py uses an exit func to do a join on all the
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	326 * threads created thru it, so this also protects pending imports in
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	327 * the threads created via Threading.
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	328 */
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	329 call_sys_exitfunc();
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	330 initialized = 0;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	331
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	332 /* Get current thread state and interpreter pointer */
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31771 diff changeset	333 tstate = PyThreadState_GET();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	334 interp = tstate->interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	335
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	336 /* Disable signal handling */
724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	337 PyOS_FiniInterrupts();
724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	338
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 27878 diff changeset	339 /* drop module references we saved */
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	340 Py_XDECREF(warnings_module);
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	341 warnings_module = NULL;
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 27878 diff changeset	342
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	343 /* Collect garbage. This may call finalizers; it's nice to call these
31057 f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	344 * before all modules are destroyed.
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	345 * XXX If a __del__ or weakref callback is triggered here, and tries to
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	346 * XXX import a module, bad things can happen, because Python no
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	347 * XXX longer believes it's initialized.
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	348 * XXX Fatal Python error: Interpreter not initialized (version mismatch?)
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	349 * XXX is easy to provoke that way. I've also seen, e.g.,
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	350 * XXX Exception exceptions.ImportError: 'No module named sha'
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	351 * XXX in <function callback at 0x008F5718> ignored
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	352 * XXX but I'm unclear on exactly how that one happens. In any case,
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	353 * XXX I haven't seen a real-life report of either of these.
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	354 */
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	355 PyGC_Collect();
7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	356
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	357 /* Destroy all modules */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	358 PyImport_Cleanup();
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	359
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	360 /* Collect final garbage. This disposes of cycles created by
31057 f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	361 * new-style class definitions, for example.
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	362 * XXX This is disabled because it caused too many problems. If
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	363 * XXX a __del__ or weakref callback triggers here, Python code has
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	364 * XXX a hard time running, because even the sys module has been
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	365 * XXX cleared out (sys.stdout is gone, sys.excepthook is gone, etc).
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	366 * XXX One symptom is a sequence of information-free messages
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	367 * XXX coming from threads (if a __del__ or callback is invoked,
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	368 * XXX other threads can execute too, and any exception they encounter
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	369 * XXX triggers a comedy of errors as subsystem after subsystem
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	370 * XXX fails to find what it expects to find in sys to help report
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	371 * XXX the exception and consequent unexpected failures). I've also
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	372 * XXX seen segfaults then, after adding print statements to the
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	373 * XXX Python code getting called.
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	374 */
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	375 #if 0
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	376 PyGC_Collect();
31057 f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	377 #endif
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	378
6786 bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	379 /* Destroy the database used by _PyImport_{Fixup,Find}Extension */
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	380 _PyImport_Fini();
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	381
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	382 /* Debugging stuff */
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	383 #ifdef COUNT_ALLOCS
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	384 dump_counts();
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	385 #endif
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	386
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	387 #ifdef Py_REF_DEBUG
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	388 fprintf(stderr, "[%ld refs]\n", _Py_RefTotal);
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	389 #endif
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	390
28647 9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	391 #ifdef Py_TRACE_REFS
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	392 /* Display all objects still alive -- this can invoke arbitrary
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	393 * __repr__ overrides, so requires a mostly-intact interpreter.
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	394 * Alas, a lot of stuff may still be alive now that will be cleaned
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	395 * up later.
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	396 */
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	397 if (Py_GETENV("PYTHONDUMPREFS"))
28647 9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	398 _Py_PrintReferences(stderr);
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	399 #endif /* Py_TRACE_REFS */
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	400
28720 03af46d1ac28 PyGILState cleanup was too early - destructors called via module cleanup may use the API. Mark Hammond <mhammond@skippinet.com.au> parents: 28698 diff changeset	401 /* Cleanup auto-thread-state */
03af46d1ac28 PyGILState cleanup was too early - destructors called via module cleanup may use the API. Mark Hammond <mhammond@skippinet.com.au> parents: 28698 diff changeset	402 #ifdef WITH_THREAD
03af46d1ac28 PyGILState cleanup was too early - destructors called via module cleanup may use the API. Mark Hammond <mhammond@skippinet.com.au> parents: 28698 diff changeset	403 _PyGILState_Fini();
03af46d1ac28 PyGILState cleanup was too early - destructors called via module cleanup may use the API. Mark Hammond <mhammond@skippinet.com.au> parents: 28698 diff changeset	404 #endif /* WITH_THREAD */
03af46d1ac28 PyGILState cleanup was too early - destructors called via module cleanup may use the API. Mark Hammond <mhammond@skippinet.com.au> parents: 28698 diff changeset	405
28613 b1671550c7e1 Move the call to _Py_PrintReferences() a bit further down. This Guido van Rossum <guido@python.org> parents: 28574 diff changeset	406 /* Clear interpreter state */
b1671550c7e1 Move the call to _Py_PrintReferences() a bit further down. This Guido van Rossum <guido@python.org> parents: 28574 diff changeset	407 PyInterpreterState_Clear(interp);
b1671550c7e1 Move the call to _Py_PrintReferences() a bit further down. This Guido van Rossum <guido@python.org> parents: 28574 diff changeset	408
34834 7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	409 /* Now we decref the exception classes. After this point nothing
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	410 can raise an exception. That's okay, because each Fini() method
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	411 below has been checked to make sure no exceptions are ever
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	412 raised.
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	413 */
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	414
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	415 _PyExc_Fini();
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	416
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	417 /* Delete current thread */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	418 PyThreadState_Swap(NULL);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	419 PyInterpreterState_Delete(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	420
28613 b1671550c7e1 Move the call to _Py_PrintReferences() a bit further down. This Guido van Rossum <guido@python.org> parents: 28574 diff changeset	421 /* Sundry finalizers */
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	422 PyMethod_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	423 PyFrame_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	424 PyCFunction_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	425 PyTuple_Fini();
33679 55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33189 diff changeset	426 PyList_Fini();
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 34972 diff changeset	427 PySet_Fini();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	428 PyString_Fini();
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	429 PyInt_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	430 PyFloat_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	431
22883 d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	432 #ifdef Py_USING_UNICODE
d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	433 /* Cleanup Unicode implementation */
d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	434 _PyUnicode_Fini();
d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	435 #endif
d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	436
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	437 /* XXX Still allocated:
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	438 - various static ad-hoc pointers to interned strings
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	439 - int and float free list blocks
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	440 - whatever various modules and libraries allocate
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	441 */
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	442
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	443 PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	444
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	445 #ifdef Py_TRACE_REFS
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	446 /* Display addresses (& refcnts) of all objects still alive.
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	447 * An address can be used to find the repr of the object, printed
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	448 * above by _Py_PrintReferences.
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	449 */
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	450 if (Py_GETENV("PYTHONDUMPREFS"))
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	451 _Py_PrintReferenceAddresses(stderr);
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	452 #endif /* Py_TRACE_REFS */
23020 e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	453 #ifdef PYMALLOC_DEBUG
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	454 if (Py_GETENV("PYTHONMALLOCSTATS"))
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	455 _PyObject_DebugMallocStats();
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	456 #endif
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	457
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	458 call_ll_exitfuncs();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	459 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	460
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	461 /* Create and initialize a new interpreter and thread, and return the
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	462 new thread. This requires that Py_Initialize() has been called
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	463 first.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	464
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	465 Unsuccessful initialization yields a NULL pointer. Note that no
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	466 exception information is available even in this case -- the
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	467 exception information is held in the thread, and there is no
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	468 thread.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	469
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	470 Locking: as above.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	471
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	472 */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	473
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	474 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	475 Py_NewInterpreter(void)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	476 {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	477 PyInterpreterState *interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	478 PyThreadState tstate, save_tstate;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	479 PyObject bimod, sysmod;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	480
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	481 if (!initialized)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	482 Py_FatalError("Py_NewInterpreter: call Py_Initialize first");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	483
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	484 interp = PyInterpreterState_New();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	485 if (interp == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	486 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	487
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	488 tstate = PyThreadState_New(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	489 if (tstate == NULL) {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	490 PyInterpreterState_Delete(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	491 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	492 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	493
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	494 save_tstate = PyThreadState_Swap(tstate);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	495
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	496 /* XXX The following is lax in error checking */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	497
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	498 interp->modules = PyDict_New();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	499
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	500 bimod = _PyImport_FindExtension("__builtin__", "__builtin__");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	501 if (bimod != NULL) {
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	502 interp->builtins = PyModule_GetDict(bimod);
b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	503 Py_INCREF(interp->builtins);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	504 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	505 sysmod = _PyImport_FindExtension("sys", "sys");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	506 if (bimod != NULL && sysmod != NULL) {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	507 interp->sysdict = PyModule_GetDict(sysmod);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	508 Py_INCREF(interp->sysdict);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	509 PySys_SetPath(Py_GetPath());
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	510 PyDict_SetItemString(interp->sysdict, "modules",
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	511 interp->modules);
27340 8b53b0ce06d4 Patch #671459: Invoke import hooks in Py_NewInterpreter. Martin v. Löwis <martin@v.loewis.de> parents: 26923 diff changeset	512 _PyImportHooks_Init();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	513 initmain();
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	514 if (!Py_NoSiteFlag)
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	515 initsite();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	516 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	517
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	518 if (!PyErr_Occurred())
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	519 return tstate;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	520
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	521 /* Oops, it didn't work. Undo it all. */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	522
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	523 PyErr_Print();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	524 PyThreadState_Clear(tstate);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	525 PyThreadState_Swap(save_tstate);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	526 PyThreadState_Delete(tstate);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	527 PyInterpreterState_Delete(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	528
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	529 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	530 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	531
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	532 /* Delete an interpreter and its last thread. This requires that the
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	533 given thread state is current, that the thread has no remaining
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	534 frames, and that it is its interpreter's only remaining thread.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	535 It is a fatal error to violate these constraints.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	536
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	537 (Py_Finalize() doesn't have these constraints -- it zaps
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	538 everything, regardless.)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	539
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	540 Locking: as above.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	541
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	542 */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	543
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	544 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	545 Py_EndInterpreter(PyThreadState *tstate)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	546 {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	547 PyInterpreterState *interp = tstate->interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	548
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31771 diff changeset	549 if (tstate != PyThreadState_GET())
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	550 Py_FatalError("Py_EndInterpreter: thread is not current");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	551 if (tstate->frame != NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	552 Py_FatalError("Py_EndInterpreter: thread still has a frame");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	553 if (tstate != interp->tstate_head \|\| tstate->next != NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	554 Py_FatalError("Py_EndInterpreter: not the last thread");
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	555
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	556 PyImport_Cleanup();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	557 PyInterpreterState_Clear(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	558 PyThreadState_Swap(NULL);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	559 PyInterpreterState_Delete(interp);
5850 6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	560 }
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	561
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	562 static char *progname = "python";
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	563
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	564 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	565 Py_SetProgramName(char *pn)
5850 6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	566 {
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	567 if (pn && *pn)
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	568 progname = pn;
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	569 }
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	570
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	571 char *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	572 Py_GetProgramName(void)
5850 6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	573 {
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	574 return progname;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	575 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	576
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	577 static char *default_home = NULL;
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	578
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	579 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	580 Py_SetPythonHome(char *home)
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	581 {
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	582 default_home = home;
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	583 }
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	584
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	585 char *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	586 Py_GetPythonHome(void)
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	587 {
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	588 char *home = default_home;
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	589 if (home == NULL && !Py_IgnoreEnvironmentFlag)
a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	590 home = Py_GETENV("PYTHONHOME");
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	591 return home;
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	592 }
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	593
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	594 /* Create __main__ module */
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	595
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	596 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	597 initmain(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	598 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	599 PyObject m, d;
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	600 m = PyImport_AddModule("__main__");
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	601 if (m == NULL)
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	602 Py_FatalError("can't create __main__ module");
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	603 d = PyModule_GetDict(m);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	604 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
6600 83ccf44bf195 Two changes (here we go again :-( ). Guido van Rossum <guido@python.org> parents: 6557 diff changeset	605 PyObject *bimod = PyImport_ImportModule("__builtin__");
83ccf44bf195 Two changes (here we go again :-( ). Guido van Rossum <guido@python.org> parents: 6557 diff changeset	606 if (bimod == NULL \|\|
83ccf44bf195 Two changes (here we go again :-( ). Guido van Rossum <guido@python.org> parents: 6557 diff changeset	607 PyDict_SetItemString(d, "__builtins__", bimod) != 0)
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	608 Py_FatalError("can't add __builtins__ to __main__");
10024 caf2c65a6bcf initmain(): Nailed a memory leak. bimod must be DECREF'd! Barry Warsaw <barry@python.org> parents: 9965 diff changeset	609 Py_DECREF(bimod);
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	610 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	611 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	612
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	613 /* Import the site module (not into __main__ though) */
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	614
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	615 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	616 initsite(void)
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	617 {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	618 PyObject m, f;
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	619 m = PyImport_ImportModule("site");
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	620 if (m == NULL) {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	621 f = PySys_GetObject("stderr");
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	622 if (Py_VerboseFlag) {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	623 PyFile_WriteString(
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	624 "'import site' failed; traceback:\n", f);
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	625 PyErr_Print();
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	626 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	627 else {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	628 PyFile_WriteString(
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	629 "'import site' failed; use -v for traceback\n", f);
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	630 PyErr_Clear();
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	631 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	632 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	633 else {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	634 Py_DECREF(m);
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	635 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	636 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	637
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	638 /* Parse input from a file and execute it */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	639
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	640 int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	641 PyRun_AnyFileExFlags(FILE fp, char filename, int closeit,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	642 PyCompilerFlags *flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	643 {
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	644 if (filename == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	645 filename = "???";
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	646 if (Py_FdIsInteractive(fp, filename)) {
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	647 int err = PyRun_InteractiveLoopFlags(fp, filename, flags);
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	648 if (closeit)
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	649 fclose(fp);
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	650 return err;
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	651 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	652 else
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	653 return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	654 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	655
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	656 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	657 PyRun_InteractiveLoopFlags(FILE fp, const char filename, PyCompilerFlags *flags)
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	658 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	659 PyObject *v;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	660 int ret;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	661 PyCompilerFlags local_flags;
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16845 diff changeset	662
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	663 if (flags == NULL) {
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	664 flags = &local_flags;
18611 fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate Tim Peters <tim.peters@gmail.com> parents: 18101 diff changeset	665 local_flags.cf_flags = 0;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	666 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	667 v = PySys_GetObject("ps1");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	668 if (v == NULL) {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	669 PySys_SetObject("ps1", v = PyString_FromString(">>> "));
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	670 Py_XDECREF(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	671 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	672 v = PySys_GetObject("ps2");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	673 if (v == NULL) {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	674 PySys_SetObject("ps2", v = PyString_FromString("... "));
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	675 Py_XDECREF(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	676 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	677 for (;;) {
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	678 ret = PyRun_InteractiveOneFlags(fp, filename, flags);
3575 e2b3a696d69c Use new names for debug macros. Don't include pythonrun.h. Guido van Rossum <guido@python.org> parents: 3489 diff changeset	679 #ifdef Py_REF_DEBUG
2612 ca6b60d4ea90 fix dusty debugging macros Guido van Rossum <guido@python.org> parents: 2529 diff changeset	680 fprintf(stderr, "[%ld refs]\n", _Py_RefTotal);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	681 #endif
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	682 if (ret == E_EOF)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	683 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	684 /*
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	685 if (ret == E_NOMEM)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	686 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	687 */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	688 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	689 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	690
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22121 diff changeset	691 /* compute parser flags based on compiler flags */
eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22121 diff changeset	692 #define PARSER_FLAGS(flags) \
27878 be7683a6f521 - Finally fixed the bug in compile() and exec where a string ending Guido van Rossum <guido@python.org> parents: 27358 diff changeset	693 (((flags) && (flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
be7683a6f521 - Finally fixed the bug in compile() and exec where a string ending Guido van Rossum <guido@python.org> parents: 27358 diff changeset	694 PyPARSE_DONT_IMPLY_DEDENT : 0)
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22121 diff changeset	695
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16845 diff changeset	696 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	697 PyRun_InteractiveOneFlags(FILE fp, const char filename, PyCompilerFlags *flags)
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16845 diff changeset	698 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	699 PyObject m, d, v, w;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	700 mod_ty mod;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	701 PyArena *arena;
6661 99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	702 char ps1 = "", ps2 = "";
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	703 int errcode = 0;
18615 0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	704
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	705 v = PySys_GetObject("ps1");
6661 99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	706 if (v != NULL) {
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	707 v = PyObject_Str(v);
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	708 if (v == NULL)
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	709 PyErr_Clear();
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	710 else if (PyString_Check(v))
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	711 ps1 = PyString_AsString(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	712 }
6661 99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	713 w = PySys_GetObject("ps2");
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	714 if (w != NULL) {
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	715 w = PyObject_Str(w);
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	716 if (w == NULL)
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	717 PyErr_Clear();
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	718 else if (PyString_Check(w))
99955b65408d Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so Guido van Rossum <guido@python.org> parents: 6600 diff changeset	719 ps2 = PyString_AsString(w);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	720 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	721 arena = PyArena_New();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	722 mod = PyParser_ASTFromFile(fp, filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	723 Py_single_input, ps1, ps2,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	724 flags, &errcode, arena);
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	725 Py_XDECREF(v);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	726 Py_XDECREF(w);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	727 if (mod == NULL) {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	728 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	729 if (errcode == E_EOF) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	730 PyErr_Clear();
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	731 return E_EOF;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	732 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	733 PyErr_Print();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	734 return -1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	735 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	736 m = PyImport_AddModule("__main__");
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	737 if (m == NULL) {
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	738 PyArena_Free(arena);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	739 return -1;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	740 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	741 d = PyModule_GetDict(m);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	742 v = run_mod(mod, filename, d, d, flags, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	743 PyArena_Free(arena);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	744 if (v == NULL) {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	745 PyErr_Print();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	746 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	747 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	748 Py_DECREF(v);
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	749 if (Py_FlushLine())
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	750 PyErr_Clear();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	751 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	752 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	753
15738 76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	754 /* Check whether a file maybe a pyc file: Look at the extension,
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	755 the file type, and, if we may close it, at the first few bytes. */
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	756
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	757 static int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	758 maybe_pyc_file(FILE fp, const char filename, const char* ext, int closeit)
15738 76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	759 {
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	760 if (strcmp(ext, ".pyc") == 0 \|\| strcmp(ext, ".pyo") == 0)
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	761 return 1;
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	762
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	763 /* Only look into the file if we are allowed to close it, since
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	764 it then should also be seekable. */
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	765 if (closeit) {
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	766 /* Read only two bytes of the magic. If the file was opened in
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	767 text mode, the bytes 3 and 4 of the magic (\r\n) might not
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	768 be read as they are on disk. */
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	769 unsigned int halfmagic = PyImport_GetMagicNumber() & 0xFFFF;
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	770 unsigned char buf[2];
16560 e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	771 /* Mess: In case of -x, the stream is NOT at its start now,
e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	772 and ungetc() was used to push back the first newline,
16648 a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	773 which makes the current stream position formally undefined,
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	774 and a x-platform nightmare.
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	775 Unfortunately, we have no direct way to know whether -x
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	776 was specified. So we use a terrible hack: if the current
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	777 stream position is not 0, we assume -x was specified, and
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	778 give up. Bug 132850 on SourceForge spells out the
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	779 hopelessness of trying anything else (fseek and ftell
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	780 don't work predictably x-platform for text-mode files).
16560 e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	781 */
e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	782 int ispyc = 0;
16648 a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	783 if (ftell(fp) == 0) {
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	784 if (fread(buf, 1, 2, fp) == 2 &&
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	785 ((unsigned int)buf[1]<<8 \| buf[0]) == halfmagic)
16648 a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	786 ispyc = 1;
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	787 rewind(fp);
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	788 }
16560 e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	789 return ispyc;
15738 76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	790 }
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	791 return 0;
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	792 }
15738 76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	793
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	794 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	795 PyRun_SimpleFileExFlags(FILE fp, const char filename, int closeit,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	796 PyCompilerFlags *flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	797 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	798 PyObject m, d, *v;
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	799 const char *ext;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	800
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	801 m = PyImport_AddModule("__main__");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	802 if (m == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	803 return -1;
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	804 d = PyModule_GetDict(m);
25827 093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	805 if (PyDict_GetItemString(d, "__file__") == NULL) {
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	806 PyObject *f = PyString_FromString(filename);
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	807 if (f == NULL)
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	808 return -1;
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	809 if (PyDict_SetItemString(d, "__file__", f) < 0) {
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	810 Py_DECREF(f);
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	811 return -1;
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	812 }
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	813 Py_DECREF(f);
093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	814 }
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	815 ext = filename + strlen(filename) - 4;
15738 76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	816 if (maybe_pyc_file(fp, filename, ext, closeit)) {
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	817 /* Try to run a pyc file. First, re-open in binary */
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	818 if (closeit)
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	819 fclose(fp);
25827 093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	820 if ((fp = fopen(filename, "rb")) == NULL) {
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	821 fprintf(stderr, "python: Can't reopen .pyc file\n");
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	822 return -1;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	823 }
5234 07ed52e200db Allow passing a .pyo file. Guido van Rossum <guido@python.org> parents: 5170 diff changeset	824 /* Turn on optimization if a .pyo file is given */
07ed52e200db Allow passing a .pyo file. Guido van Rossum <guido@python.org> parents: 5170 diff changeset	825 if (strcmp(ext, ".pyo") == 0)
07ed52e200db Allow passing a .pyo file. Guido van Rossum <guido@python.org> parents: 5170 diff changeset	826 Py_OptimizeFlag = 1;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	827 v = run_pyc_file(fp, filename, d, d, flags);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	828 } else {
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	829 v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	830 closeit, flags);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	831 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	832 if (v == NULL) {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	833 PyErr_Print();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	834 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	835 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	836 Py_DECREF(v);
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	837 if (Py_FlushLine())
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	838 PyErr_Clear();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	839 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	840 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	841
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	842 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	843 PyRun_SimpleStringFlags(const char command, PyCompilerFlags flags)
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	844 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	845 PyObject m, d, *v;
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	846 m = PyImport_AddModule("__main__");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	847 if (m == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	848 return -1;
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	849 d = PyModule_GetDict(m);
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19343 diff changeset	850 v = PyRun_StringFlags(command, Py_file_input, d, d, flags);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	851 if (v == NULL) {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	852 PyErr_Print();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	853 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	854 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	855 Py_DECREF(v);
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	856 if (Py_FlushLine())
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	857 PyErr_Clear();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	858 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	859 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	860
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	861 static int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	862 parse_syntax_error(PyObject err, PyObject message, const char *filename,
cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	863 int lineno, int offset, const char **text)
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	864 {
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	865 long hold;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	866 PyObject *v;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	867
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	868 /* old style errors */
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	869 if (PyTuple_Check(err))
22721 253de588f2fb Get rid of another use of PyArg_Parse() Neal Norwitz <nnorwitz@gmail.com> parents: 22468 diff changeset	870 return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
253de588f2fb Get rid of another use of PyArg_Parse() Neal Norwitz <nnorwitz@gmail.com> parents: 22468 diff changeset	871 lineno, offset, text);
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	872
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	873 /* new style errors. `err' is an instance */
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	874
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	875 if (! (v = PyObject_GetAttrString(err, "msg")))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	876 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	877 *message = v;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	878
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	879 if (!(v = PyObject_GetAttrString(err, "filename")))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	880 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	881 if (v == Py_None)
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	882 *filename = NULL;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	883 else if (! (*filename = PyString_AsString(v)))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	884 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	885
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	886 Py_DECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	887 if (!(v = PyObject_GetAttrString(err, "lineno")))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	888 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	889 hold = PyInt_AsLong(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	890 Py_DECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	891 v = NULL;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	892 if (hold < 0 && PyErr_Occurred())
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	893 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	894 *lineno = (int)hold;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	895
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	896 if (!(v = PyObject_GetAttrString(err, "offset")))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	897 goto finally;
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	898 if (v == Py_None) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	899 *offset = -1;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	900 Py_DECREF(v);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	901 v = NULL;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	902 } else {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	903 hold = PyInt_AsLong(v);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	904 Py_DECREF(v);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	905 v = NULL;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	906 if (hold < 0 && PyErr_Occurred())
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	907 goto finally;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	908 *offset = (int)hold;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	909 }
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	910
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	911 if (!(v = PyObject_GetAttrString(err, "text")))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	912 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	913 if (v == Py_None)
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	914 *text = NULL;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	915 else if (! (*text = PyString_AsString(v)))
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	916 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	917 Py_DECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	918 return 1;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	919
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	920 finally:
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	921 Py_XDECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	922 return 0;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	923 }
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	924
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	925 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	926 PyErr_Print(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	927 {
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	928 PyErr_PrintEx(1);
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	929 }
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	930
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	931 static void
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	932 print_error_text(PyObject f, int offset, const char text)
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	933 {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	934 char *nl;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	935 if (offset >= 0) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	936 if (offset > 0 && offset == (int)strlen(text))
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	937 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	938 for (;;) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	939 nl = strchr(text, '\n');
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	940 if (nl == NULL \|\| nl-text >= offset)
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	941 break;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36078 diff changeset	942 offset -= (int)(nl+1-text);
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	943 text = nl+1;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	944 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	945 while (text == ' ' \|\| text == '\t') {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	946 text++;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	947 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	948 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	949 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	950 PyFile_WriteString(" ", f);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	951 PyFile_WriteString(text, f);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	952 if (*text == '\0' \|\| text[strlen(text)-1] != '\n')
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	953 PyFile_WriteString("\n", f);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	954 if (offset == -1)
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	955 return;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	956 PyFile_WriteString(" ", f);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	957 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	958 while (offset > 0) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	959 PyFile_WriteString(" ", f);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	960 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	961 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	962 PyFile_WriteString("^\n", f);
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	963 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	964
17212 215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	965 static void
215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	966 handle_system_exit(void)
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	967 {
17212 215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	968 PyObject exception, value, *tb;
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	969 int exitcode = 0;
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	970
17212 215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	971 PyErr_Fetch(&exception, &value, &tb);
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	972 if (Py_FlushLine())
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	973 PyErr_Clear();
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	974 fflush(stdout);
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	975 if (value == NULL \|\| value == Py_None)
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	976 goto done;
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	977 if (PyInstance_Check(value)) {
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	978 /* The error code should be in the `code' attribute. */
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	979 PyObject *code = PyObject_GetAttrString(value, "code");
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	980 if (code) {
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	981 Py_DECREF(value);
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	982 value = code;
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	983 if (value == Py_None)
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	984 goto done;
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	985 }
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	986 /* If we failed to dig out the 'code' attribute,
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	987 just let the else clause below print the error. */
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	988 }
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	989 if (PyInt_Check(value))
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	990 exitcode = (int)PyInt_AsLong(value);
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	991 else {
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	992 PyObject_Print(value, stderr, Py_PRINT_RAW);
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	993 PySys_WriteStderr("\n");
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	994 exitcode = 1;
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	995 }
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	996 done:
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	997 /* Restore and clear the exception info, in order to properly decref
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	998 * the exception, value, and traceback. If we just exit instead,
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	999 * these leak, which confuses PYTHONDUMPREFS output, and may prevent
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1000 * some finalizers from running.
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1001 */
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1002 PyErr_Restore(exception, value, tb);
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1003 PyErr_Clear();
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1004 Py_Exit(exitcode);
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1005 /* NOTREACHED */
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1006 }
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1007
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1008 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1009 PyErr_PrintEx(int set_sys_last_vars)
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1010 {
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1011 PyObject exception, v, tb, hook;
17212 215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1012
215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1013 if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1014 handle_system_exit();
215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1015 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1016 PyErr_Fetch(&exception, &v, &tb);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1017 if (exception == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1018 return;
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1019 PyErr_NormalizeException(&exception, &v, &tb);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2022 diff changeset	1020 if (exception == NULL)
5611 5ed3a21cc122 Can't return 0 from void function... Guido van Rossum <guido@python.org> parents: 5607 diff changeset	1021 return;
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1022 if (set_sys_last_vars) {
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1023 PySys_SetObject("last_type", exception);
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1024 PySys_SetObject("last_value", v);
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1025 PySys_SetObject("last_traceback", tb);
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1026 }
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1027 hook = PySys_GetObject("excepthook");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1028 if (hook) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30122 diff changeset	1029 PyObject *args = PyTuple_Pack(3,
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1030 exception, v ? v : Py_None, tb ? tb : Py_None);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1031 PyObject *result = PyEval_CallObject(hook, args);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1032 if (result == NULL) {
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1033 PyObject exception2, v2, *tb2;
17212 215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1034 if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1035 handle_system_exit();
215dc725db84 Finishing touch to Ping's changes. This is a patch that Ping sent me Guido van Rossum <guido@python.org> parents: 17207 diff changeset	1036 }
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1037 PyErr_Fetch(&exception2, &v2, &tb2);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1038 PyErr_NormalizeException(&exception2, &v2, &tb2);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1039 if (Py_FlushLine())
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1040 PyErr_Clear();
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1041 fflush(stdout);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1042 PySys_WriteStderr("Error in sys.excepthook:\n");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1043 PyErr_Display(exception2, v2, tb2);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1044 PySys_WriteStderr("\nOriginal exception was:\n");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1045 PyErr_Display(exception, v, tb);
21284 43b8a962a32a Missing DECREFs when exception is raised in sys.excepthook. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21251 diff changeset	1046 Py_XDECREF(exception2);
43b8a962a32a Missing DECREFs when exception is raised in sys.excepthook. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21251 diff changeset	1047 Py_XDECREF(v2);
43b8a962a32a Missing DECREFs when exception is raised in sys.excepthook. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21251 diff changeset	1048 Py_XDECREF(tb2);
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1049 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1050 Py_XDECREF(result);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1051 Py_XDECREF(args);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1052 } else {
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1053 PySys_WriteStderr("sys.excepthook is missing\n");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1054 PyErr_Display(exception, v, tb);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1055 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1056 Py_XDECREF(exception);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1057 Py_XDECREF(v);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1058 Py_XDECREF(tb);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1059 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1060
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1061 void PyErr_Display(PyObject exception, PyObject value, PyObject *tb)
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1062 {
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1063 int err = 0;
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1064 PyObject *f = PySys_GetObject("stderr");
31771 76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1065 Py_INCREF(value);
1073 2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1015 diff changeset	1066 if (f == NULL)
2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1015 diff changeset	1067 fprintf(stderr, "lost sys.stderr\n");
2c0432fcc270 Modified most (but not yet all) I/O to always go through sys.stdout or Guido van Rossum <guido@python.org> parents: 1015 diff changeset	1068 else {
7509 b5d52c415b15 Fix the handling of errors in Py_FlushLine() in a few places. Guido van Rossum <guido@python.org> parents: 7206 diff changeset	1069 if (Py_FlushLine())
b5d52c415b15 Fix the handling of errors in Py_FlushLine() in a few places. Guido van Rossum <guido@python.org> parents: 7206 diff changeset	1070 PyErr_Clear();
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1071 fflush(stdout);
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1072 if (tb && tb != Py_None)
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1073 err = PyTraceBack_Print(tb, f);
6165 29ddf1049842 PyErr_Print(): Use PyErr_GivenExceptionMatches() instead of pointer Barry Warsaw <barry@python.org> parents: 6136 diff changeset	1074 if (err == 0 &&
31771 76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1075 PyObject_HasAttrString(value, "print_file_and_line"))
6165 29ddf1049842 PyErr_Print(): Use PyErr_GivenExceptionMatches() instead of pointer Barry Warsaw <barry@python.org> parents: 6136 diff changeset	1076 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1077 PyObject *message;
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1078 const char filename, text;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1079 int lineno, offset;
31771 76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1080 if (!parse_syntax_error(value, &message, &filename,
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1081 &lineno, &offset, &text))
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1082 PyErr_Clear();
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1083 else {
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1084 char buf[10];
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1085 PyFile_WriteString(" File \"", f);
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1086 if (filename == NULL)
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1087 PyFile_WriteString("<string>", f);
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1088 else
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1089 PyFile_WriteString(filename, f);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1090 PyFile_WriteString("\", line ", f);
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20969 diff changeset	1091 PyOS_snprintf(buf, sizeof(buf), "%d", lineno);
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1092 PyFile_WriteString(buf, f);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1093 PyFile_WriteString("\n", f);
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1094 if (text != NULL)
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1095 print_error_text(f, offset, text);
31771 76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1096 Py_DECREF(value);
76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1097 value = message;
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1098 /* Can't be bothered to check all those
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1099 PyFile_WriteString() calls */
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1100 if (PyErr_Occurred())
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1101 err = -1;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1102 }
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1103 }
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1104 if (err) {
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1105 /* Don't do anything else */
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1106 }
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1107 else if (PyClass_Check(exception)) {
6322 05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1108 PyClassObject* exc = (PyClassObject*)exception;
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1109 PyObject* className = exc->cl_name;
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1110 PyObject* moduleName =
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1111 PyDict_GetItemString(exc->cl_dict, "__module__");
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1112
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1113 if (moduleName == NULL)
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1114 err = PyFile_WriteString("<unknown>", f);
6322 05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1115 else {
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1116 char* modstr = PyString_AsString(moduleName);
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1117 if (modstr && strcmp(modstr, "exceptions"))
6322 05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1118 {
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1119 err = PyFile_WriteString(modstr, f);
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1120 err += PyFile_WriteString(".", f);
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1121 }
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1122 }
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1123 if (err == 0) {
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1124 if (className == NULL)
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1125 err = PyFile_WriteString("<unknown>", f);
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1126 else
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1127 err = PyFile_WriteObject(className, f,
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1128 Py_PRINT_RAW);
05d943c4597c PyErr_Print(): When printing a class exception, try to dig out the Barry Warsaw <barry@python.org> parents: 6246 diff changeset	1129 }
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1130 }
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1131 else
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1132 err = PyFile_WriteObject(exception, f, Py_PRINT_RAW);
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1133 if (err == 0) {
31771 76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1134 if (value != Py_None) {
76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1135 PyObject *s = PyObject_Str(value);
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1136 /* only print colon if the str() of the
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1137 object is not the empty string
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1138 */
6246 4cf20fa883a9 Fixed some details of printing the str() of an exception. This fixes Guido van Rossum <guido@python.org> parents: 6201 diff changeset	1139 if (s == NULL)
4cf20fa883a9 Fixed some details of printing the str() of an exception. This fixes Guido van Rossum <guido@python.org> parents: 6201 diff changeset	1140 err = -1;
4cf20fa883a9 Fixed some details of printing the str() of an exception. This fixes Guido van Rossum <guido@python.org> parents: 6201 diff changeset	1141 else if (!PyString_Check(s) \|\|
4cf20fa883a9 Fixed some details of printing the str() of an exception. This fixes Guido van Rossum <guido@python.org> parents: 6201 diff changeset	1142 PyString_GET_SIZE(s) != 0)
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1143 err = PyFile_WriteString(": ", f);
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1144 if (err == 0)
6246 4cf20fa883a9 Fixed some details of printing the str() of an exception. This fixes Guido van Rossum <guido@python.org> parents: 6201 diff changeset	1145 err = PyFile_WriteObject(s, f, Py_PRINT_RAW);
4cf20fa883a9 Fixed some details of printing the str() of an exception. This fixes Guido van Rossum <guido@python.org> parents: 6201 diff changeset	1146 Py_XDECREF(s);
2293 a24146241991 print class name for exceptions that are classes Guido van Rossum <guido@python.org> parents: 2279 diff changeset	1147 }
a24146241991 print class name for exceptions that are classes Guido van Rossum <guido@python.org> parents: 2279 diff changeset	1148 }
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1149 if (err == 0)
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1150 err = PyFile_WriteString("\n", f);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1151 }
31771 76053a1dd452 Lost reference. Armin Rigo <arigo@tunes.org> parents: 31504 diff changeset	1152 Py_DECREF(value);
5607 cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1153 /* If an error happened here, don't show it.
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1154 XXX This is wrong, but too many callers rely on this behavior. */
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1155 if (err != 0)
cbb4e3cf086e Py_FlushLine and PyFile_WriteString now return error indicators Guido van Rossum <guido@python.org> parents: 5593 diff changeset	1156 PyErr_Clear();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1157 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1158
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1159 PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1160 PyRun_StringFlags(const char str, int start, PyObject globals,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1161 PyObject locals, PyCompilerFlags flags)
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	1162 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1163 PyObject *ret;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1164 PyArena *arena = PyArena_New();
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1165 mod_ty mod = PyParser_ASTFromString(str, "<string>", start, flags,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1166 arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1167 ret = run_err_mod(mod, "<string>", globals, locals, flags, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1168 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1169 return ret;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1170 }
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1171
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1172 PyObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1173 PyRun_FileExFlags(FILE fp, const char filename, int start, PyObject *globals,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1174 PyObject locals, int closeit, PyCompilerFlags flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1175 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1176 PyObject *ret;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1177 PyArena *arena = PyArena_New();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1178 mod_ty mod = PyParser_ASTFromFile(fp, filename, start, 0, 0,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1179 flags, NULL, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1180 if (mod == NULL) {
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1181 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1182 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1183 }
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1184 if (closeit)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1185 fclose(fp);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1186 ret = run_err_mod(mod, filename, globals, locals, flags, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1187 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1188 return ret;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1189 }
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1190
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1191 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1192 run_err_mod(mod_ty mod, const char filename, PyObject globals,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1193 PyObject locals, PyCompilerFlags flags, PyArena *arena)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1194 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1195 if (mod == NULL)
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1196 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1197 return run_mod(mod, filename, globals, locals, flags, arena);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1198 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1199
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1200 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1201 run_mod(mod_ty mod, const char filename, PyObject globals, PyObject *locals,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1202 PyCompilerFlags flags, PyArena arena)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1203 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1204 PyCodeObject *co;
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1205 PyObject *v;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1206 co = PyAST_Compile(mod, filename, flags, arena);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1207 if (co == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1208 return NULL;
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1209 v = PyEval_EvalCode(co, globals, locals);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1210 Py_DECREF(co);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1211 return v;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1212 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1213
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1214 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1215 run_pyc_file(FILE fp, const char filename, PyObject *globals,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1216 PyObject locals, PyCompilerFlags flags)
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1217 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1218 PyCodeObject *co;
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1219 PyObject *v;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1220 long magic;
14278 fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	1221 long PyImport_GetMagicNumber(void);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1222
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1223 magic = PyMarshal_ReadLongFromFile(fp);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1224 if (magic != PyImport_GetMagicNumber()) {
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1225 PyErr_SetString(PyExc_RuntimeError,
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1226 "Bad magic number in .pyc file");
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1227 return NULL;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1228 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1229 (void) PyMarshal_ReadLongFromFile(fp);
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16073 diff changeset	1230 v = PyMarshal_ReadLastObjectFromFile(fp);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1231 fclose(fp);
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1232 if (v == NULL \|\| !PyCode_Check(v)) {
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1233 Py_XDECREF(v);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1234 PyErr_SetString(PyExc_RuntimeError,
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1235 "Bad code object in .pyc file");
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1236 return NULL;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1237 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1238 co = (PyCodeObject *)v;
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1239 v = PyEval_EvalCode(co, globals, locals);
19158 97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19099 diff changeset	1240 if (v && flags)
97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19099 diff changeset	1241 flags->cf_flags \|= (co->co_flags & PyCF_MASK);
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1242 Py_DECREF(co);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1243 return v;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1244 }
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1245
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1246 PyObject *
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1247 Py_CompileStringFlags(const char str, const char filename, int start,
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1248 PyCompilerFlags *flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1249 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1250 PyCodeObject *co;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1251 PyArena *arena = PyArena_New();
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1252 mod_ty mod = PyParser_ASTFromString(str, filename, start, flags, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1253 if (mod == NULL) {
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1254 PyArena_Free(arena);
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1255 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1256 }
36662 2ab9270ef19a Check whether there are flags. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	1257 if (flags && (flags->cf_flags & PyCF_ONLY_AST)) {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1258 PyObject *result = PyAST_mod2obj(mod);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1259 PyArena_Free(arena);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1260 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1261 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1262 co = PyAST_Compile(mod, filename, flags, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1263 PyArena_Free(arena);
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1264 return (PyObject *)co;
1263 65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1265 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1266
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1267 struct symtable *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1268 Py_SymtableString(const char str, const char filename, int start)
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1269 {
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1270 struct symtable *st;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1271 PyArena *arena = PyArena_New();
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1272 mod_ty mod = PyParser_ASTFromString(str, filename, start, NULL, arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1273 if (mod == NULL) {
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1274 PyArena_Free(arena);
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1275 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1276 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1277 st = PySymtable_Build(mod, filename, 0);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1278 PyArena_Free(arena);
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1279 return st;
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1280 }
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1281
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1282 /* Preferred access to parser is through AST. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1283 mod_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1284 PyParser_ASTFromString(const char s, const char filename, int start,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1285 PyCompilerFlags flags, PyArena arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1286 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1287 mod_ty mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1288 perrdetail err;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1289 node *n = PyParser_ParseStringFlagsFilename(s, filename,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1290 &_PyParser_Grammar, start, &err,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1291 PARSER_FLAGS(flags));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1292 if (n) {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1293 mod = PyAST_FromNode(n, flags, filename, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1294 PyNode_Free(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1295 return mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1296 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1297 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1298 err_input(&err);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1299 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1300 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1301 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1302
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1303 mod_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1304 PyParser_ASTFromFile(FILE fp, const char filename, int start, char *ps1,
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1305 char ps2, PyCompilerFlags flags, int *errcode,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1306 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1307 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1308 mod_ty mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1309 perrdetail err;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1310 node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1311 start, ps1, ps2, &err, PARSER_FLAGS(flags));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1312 if (n) {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1313 mod = PyAST_FromNode(n, flags, filename, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1314 PyNode_Free(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1315 return mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1316 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1317 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1318 err_input(&err);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1319 if (errcode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1320 *errcode = err.error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1321 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1322 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1323 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1324
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1325 /* Simplified interface to parsefile -- return node or set exception */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1326
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1327 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1328 PyParser_SimpleParseFileFlags(FILE fp, const char filename, int start, int flags)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1329 {
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1330 perrdetail err;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1331 node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1332 start, NULL, NULL, &err, flags);
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1333 if (n == NULL)
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1334 err_input(&err);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1335
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1336 return n;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1337 }
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1338
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1339 /* Simplified interface to parsestring -- return node or set exception */
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1340
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1341 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1342 PyParser_SimpleParseStringFlags(const char *str, int start, int flags)
18615 0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1343 {
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1344 perrdetail err;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1345 node *n = PyParser_ParseStringFlags(str, &_PyParser_Grammar,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1346 start, &err, flags);
18615 0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1347 if (n == NULL)
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1348 err_input(&err);
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1349 return n;
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1350 }
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1351
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1352 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1353 PyParser_SimpleParseStringFlagsFilename(const char str, const char filename,
24159 cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1354 int start, int flags)
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1355 {
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1356 perrdetail err;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1357 node *n = PyParser_ParseStringFlagsFilename(str, filename,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1358 &_PyParser_Grammar, start, &err, flags);
24159 cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1359 if (n == NULL)
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1360 err_input(&err);
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1361 return n;
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1362 }
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1363
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1364 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1365 PyParser_SimpleParseStringFilename(const char str, const char filename, int start)
24159 cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1366 {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 35961 diff changeset	1367 return PyParser_SimpleParseStringFlagsFilename(str, filename, start, 0);
24159 cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1368 }
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1369
28649 04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1370 /* May want to move a more generalized form of this to parsetok.c or
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1371 even parser modules. */
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1372
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1373 void
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1374 PyParser_SetError(perrdetail *err)
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1375 {
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1376 err_input(err);
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1377 }
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1378
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1379 /* Set the error appropriate to the given input error code (see errcode.h) */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1380
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1381 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1382 err_input(perrdetail *err)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1383 {
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1384 PyObject v, w, *errtype;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1385 PyObject* u = NULL;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1386 char *msg = NULL;
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1387 errtype = PyExc_SyntaxError;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1388 switch (err->error) {
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1389 case E_SYNTAX:
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1390 errtype = PyExc_IndentationError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1391 if (err->expected == INDENT)
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1392 msg = "expected an indented block";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1393 else if (err->token == INDENT)
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1394 msg = "unexpected indent";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1395 else if (err->token == DEDENT)
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1396 msg = "unexpected unindent";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1397 else {
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1398 errtype = PyExc_SyntaxError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1399 msg = "invalid syntax";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1400 }
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1401 break;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1402 case E_TOKEN:
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1403 msg = "invalid token";
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1404 break;
24839 17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1405 case E_EOFS:
17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1406 msg = "EOF while scanning triple-quoted string";
17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1407 break;
17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1408 case E_EOLS:
17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1409 msg = "EOL while scanning single-quoted string";
17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1410 break;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1411 case E_INTR:
32526 78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 31797 diff changeset	1412 if (!PyErr_Occurred())
78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 31797 diff changeset	1413 PyErr_SetNone(PyExc_KeyboardInterrupt);
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1414 return;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1415 case E_NOMEM:
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1416 PyErr_NoMemory();
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1417 return;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1418 case E_EOF:
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1419 msg = "unexpected EOF while parsing";
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1420 break;
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1421 case E_TABSPACE:
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1422 errtype = PyExc_TabError;
7967 bbd2b5d8d0b6 Translate E_INDENT to the clearest error message I can think of. Guido van Rossum <guido@python.org> parents: 7847 diff changeset	1423 msg = "inconsistent use of tabs and spaces in indentation";
bbd2b5d8d0b6 Translate E_INDENT to the clearest error message I can think of. Guido van Rossum <guido@python.org> parents: 7847 diff changeset	1424 break;
12970 63436719d12e Add new parser error code, E_OVERFLOW. This error is returned when Jeremy Hylton <jeremy@alum.mit.edu> parents: 12754 diff changeset	1425 case E_OVERFLOW:
63436719d12e Add new parser error code, E_OVERFLOW. This error is returned when Jeremy Hylton <jeremy@alum.mit.edu> parents: 12754 diff changeset	1426 msg = "expression too long";
63436719d12e Add new parser error code, E_OVERFLOW. This error is returned when Jeremy Hylton <jeremy@alum.mit.edu> parents: 12754 diff changeset	1427 break;
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1428 case E_DEDENT:
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1429 errtype = PyExc_IndentationError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1430 msg = "unindent does not match any outer indentation level";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1431 break;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1432 case E_TOODEEP:
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1433 errtype = PyExc_IndentationError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1434 msg = "too many levels of indentation";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1435 break;
35417 e48fcd4c358d Forward UnicodeDecodeError into SyntaxError for source encoding errors. Martin v. Löwis <martin@v.loewis.de> parents: 35297 diff changeset	1436 case E_DECODE: {
e48fcd4c358d Forward UnicodeDecodeError into SyntaxError for source encoding errors. Martin v. Löwis <martin@v.loewis.de> parents: 35297 diff changeset	1437 PyObject type, value, *tb;
e48fcd4c358d Forward UnicodeDecodeError into SyntaxError for source encoding errors. Martin v. Löwis <martin@v.loewis.de> parents: 35297 diff changeset	1438 PyErr_Fetch(&type, &value, &tb);
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1439 if (value != NULL) {
35417 e48fcd4c358d Forward UnicodeDecodeError into SyntaxError for source encoding errors. Martin v. Löwis <martin@v.loewis.de> parents: 35297 diff changeset	1440 u = PyObject_Str(value);
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1441 if (u != NULL) {
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1442 msg = PyString_AsString(u);
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1443 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1444 }
32781 caaef302f1e3 Patch #984714: Properly diagnose E_DECODE errors. Martin v. Löwis <martin@v.loewis.de> parents: 32526 diff changeset	1445 if (msg == NULL)
caaef302f1e3 Patch #984714: Properly diagnose E_DECODE errors. Martin v. Löwis <martin@v.loewis.de> parents: 32526 diff changeset	1446 msg = "unknown decode error";
36078 1ff4790b7605 Fix Bug #1378022, UTF-8 files with a leading BOM crashed the interpreter. Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1447 Py_XDECREF(type);
1ff4790b7605 Fix Bug #1378022, UTF-8 files with a leading BOM crashed the interpreter. Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	1448 Py_XDECREF(value);
35666 b8e571e6de2e - Fix segfault with invalid coding. Neal Norwitz <nnorwitz@gmail.com> parents: 35417 diff changeset	1449 Py_XDECREF(tb);
32781 caaef302f1e3 Patch #984714: Properly diagnose E_DECODE errors. Martin v. Löwis <martin@v.loewis.de> parents: 32526 diff changeset	1450 break;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1451 }
34664 3785610ff763 Patch #802188: better parser error message for non-EOL following line cont. Martin v. Löwis <martin@v.loewis.de> parents: 33747 diff changeset	1452 case E_LINECONT:
3785610ff763 Patch #802188: better parser error message for non-EOL following line cont. Martin v. Löwis <martin@v.loewis.de> parents: 33747 diff changeset	1453 msg = "unexpected character after line continuation character";
3785610ff763 Patch #802188: better parser error message for non-EOL following line cont. Martin v. Löwis <martin@v.loewis.de> parents: 33747 diff changeset	1454 break;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1455 default:
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1456 fprintf(stderr, "error=%d\n", err->error);
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1457 msg = "unknown parsing error";
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1458 break;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1459 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1460 v = Py_BuildValue("(ziiz)", err->filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1461 err->lineno, err->offset, err->text);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1462 if (err->text != NULL) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1463 PyMem_DEL(err->text);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1464 err->text = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1465 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1466 w = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1467 if (v != NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1468 w = Py_BuildValue("(sO)", msg, v);
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1469 Py_XDECREF(u);
17168 0d52358cb288 Fix memory leak with SyntaxError. (The DECREF was originally hidden Guido van Rossum <guido@python.org> parents: 17164 diff changeset	1470 Py_XDECREF(v);
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1471 PyErr_SetObject(errtype, w);
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1472 Py_XDECREF(w);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1473 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1474
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1475 /* Print fatal error message and abort */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1476
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1477 void
24155 9456a2ccda61 The Py_REF_DEBUG/COUNT_ALLOCS/Py_TRACE_REFS macro minefield: added Tim Peters <tim.peters@gmail.com> parents: 24071 diff changeset	1478 Py_FatalError(const char *msg)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1479 {
1911 a7f269610ec2 * Python/pythonrun.c: add string "Python" to fatal error message Guido van Rossum <guido@python.org> parents: 1898 diff changeset	1480 fprintf(stderr, "Fatal Python error: %s\n", msg);
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23252 diff changeset	1481 #ifdef MS_WINDOWS
5593 451c7ccf36b6 Added a space in an error message Guido van Rossum <guido@python.org> parents: 5438 diff changeset	1482 OutputDebugString("Fatal Python error: ");
2529 16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	1483 OutputDebugString(msg);
16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	1484 OutputDebugString("\n");
8988 070de4d39ddd Add DebugBreak() call to Py_FatalError() for Mark Hammond (only on Guido van Rossum <guido@python.org> parents: 7967 diff changeset	1485 #ifdef _DEBUG
070de4d39ddd Add DebugBreak() call to Py_FatalError() for Mark Hammond (only on Guido van Rossum <guido@python.org> parents: 7967 diff changeset	1486 DebugBreak();
2529 16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	1487 #endif
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23252 diff changeset	1488 #endif /* MS_WINDOWS */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1489 abort();
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1490 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1491
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1492 /* Clean up and exit */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1493
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1494 #ifdef WITH_THREAD
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9192 diff changeset	1495 #include "pythread.h"
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 941 diff changeset	1496 #endif
a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 941 diff changeset	1497
9192 ac6c29d1f10c On second though, NEXITFUNCS should be defined here and not in Guido van Rossum <guido@python.org> parents: 9161 diff changeset	1498 #define NEXITFUNCS 32
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1499 static void (*exitfuncs[NEXITFUNCS])(void);
1870 61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1500 static int nexitfuncs = 0;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1501
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1502 int Py_AtExit(void (*func)(void))
1870 61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1503 {
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1504 if (nexitfuncs >= NEXITFUNCS)
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1505 return -1;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1506 exitfuncs[nexitfuncs++] = func;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1507 return 0;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1508 }
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1509
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	1510 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1511 call_sys_exitfunc(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1512 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1513 PyObject *exitfunc = PySys_GetObject("exitfunc");
1015 f3d5e2c3b9a3 Add sys.exitfunc feature. Make askync non-static. Guido van Rossum <guido@python.org> parents: 961 diff changeset	1514
f3d5e2c3b9a3 Add sys.exitfunc feature. Make askync non-static. Guido van Rossum <guido@python.org> parents: 961 diff changeset	1515 if (exitfunc) {
17207 16f145aac2ec call_sys_exitfunc(): Remove unused variable f. Fred Drake <fdrake@acm.org> parents: 17191 diff changeset	1516 PyObject *res;
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1517 Py_INCREF(exitfunc);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1518 PySys_SetObject("exitfunc", (PyObject *)NULL);
f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1519 res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
1015 f3d5e2c3b9a3 Add sys.exitfunc feature. Make askync non-static. Guido van Rossum <guido@python.org> parents: 961 diff changeset	1520 if (res == NULL) {
17191 eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1521 if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1522 PySys_WriteStderr("Error in sys.exitfunc:\n");
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1523 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1524 PyErr_Print();
1015 f3d5e2c3b9a3 Add sys.exitfunc feature. Make askync non-static. Guido van Rossum <guido@python.org> parents: 961 diff changeset	1525 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1526 Py_DECREF(exitfunc);
1015 f3d5e2c3b9a3 Add sys.exitfunc feature. Make askync non-static. Guido van Rossum <guido@python.org> parents: 961 diff changeset	1527 }
f3d5e2c3b9a3 Add sys.exitfunc feature. Make askync non-static. Guido van Rossum <guido@python.org> parents: 961 diff changeset	1528
7509 b5d52c415b15 Fix the handling of errors in Py_FlushLine() in a few places. Guido van Rossum <guido@python.org> parents: 7206 diff changeset	1529 if (Py_FlushLine())
b5d52c415b15 Fix the handling of errors in Py_FlushLine() in a few places. Guido van Rossum <guido@python.org> parents: 7206 diff changeset	1530 PyErr_Clear();
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	1531 }
1870 61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1532
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	1533 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1534 call_ll_exitfuncs(void)
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	1535 {
1870 61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1536 while (nexitfuncs > 0)
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	1537 (*exitfuncs[--nexitfuncs])();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	1538
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	1539 fflush(stdout);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	1540 fflush(stderr);
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1541 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1542
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1543 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1544 Py_Exit(int sts)
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1545 {
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	1546 Py_Finalize();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1547
3235 3df9ab03badf Moved mac-specific exit handling to macmain.c Jack Jansen <jack.jansen@cwi.nl> parents: 3152 diff changeset	1548 exit(sts);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1549 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1550
1319 cd397266dc1c * Makefile: added all: and default: targets. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	1551 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1552 initsigs(void)
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1553 {
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1554 #ifdef SIGPIPE
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1555 PyOS_setsig(SIGPIPE, SIG_IGN);
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1556 #endif
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	1557 #ifdef SIGXFZ
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1558 PyOS_setsig(SIGXFZ, SIG_IGN);
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	1559 #endif
23252 4f335ca3f11c Ignore SIGXFSZ. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23020 diff changeset	1560 #ifdef SIGXFSZ
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1561 PyOS_setsig(SIGXFSZ, SIG_IGN);
23252 4f335ca3f11c Ignore SIGXFSZ. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23020 diff changeset	1562 #endif
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1563 PyOS_InitInterrupts(); /* May imply initsignal() */
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1564 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	1565
5108 a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1566
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1567 /*
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1568 * The file descriptor fd is considered ``interactive'' if either
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1569 * a) isatty(fd) is TRUE, or
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1570 * b) the -i flag was given, and the filename associated with
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1571 * the descriptor is NULL or "<stdin>" or "???".
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1572 */
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1573 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1574 Py_FdIsInteractive(FILE fp, const char filename)
5108 a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1575 {
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1576 if (isatty((int)fileno(fp)))
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1577 return 1;
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1578 if (!Py_InteractiveFlag)
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1579 return 0;
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1580 return (filename == NULL) \|\|
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1581 (strcmp(filename, "<stdin>") == 0) \|\|
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1582 (strcmp(filename, "???") == 0);
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	1583 }
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1584
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1585
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1586 #if defined(USE_STACKCHECK)
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1587 #if defined(WIN32) && defined(_MSC_VER)
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1588
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1589 /* Stack checking for Microsoft C */
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1590
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1591 #include <malloc.h>
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1592 #include <excpt.h>
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1593
14278 fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	1594 /*
fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	1595 * Return non-zero when we run out of memory on the stack; zero otherwise.
fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	1596 */
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1597 int
14280 68b61aa1aa4a PyOS_CheckStack(): Better ANSI'fy this while we're at it. Fred Drake <fdrake@acm.org> parents: 14278 diff changeset	1598 PyOS_CheckStack(void)
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1599 {
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1600 __try {
25573 0231cc54f87e s/_alloca/alloca/g; Windows doesn't need the former, at least not unless Tim Peters <tim.peters@gmail.com> parents: 24839 diff changeset	1601 /* alloca throws a stack overflow exception if there's
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1602 not enough space left on the stack */
25573 0231cc54f87e s/_alloca/alloca/g; Windows doesn't need the former, at least not unless Tim Peters <tim.peters@gmail.com> parents: 24839 diff changeset	1603 alloca(PYOS_STACK_MARGIN * sizeof(void*));
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1604 return 0;
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1605 } __except (EXCEPTION_EXECUTE_HANDLER) {
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1606 /* just ignore all errors */
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1607 }
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1608 return 1;
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1609 }
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1610
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1611 #endif /* WIN32 && _MSC_VER */
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1612
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1613 /* Alternate implementations can be added here... */
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1614
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	1615 #endif /* USE_STACKCHECK */
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1616
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1617
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1618 /* Wrappers around sigaction() or signal(). */
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1619
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1620 PyOS_sighandler_t
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1621 PyOS_getsig(int sig)
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1622 {
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1623 #ifdef HAVE_SIGACTION
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1624 struct sigaction context;
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1625 if (sigaction(sig, NULL, &context) == -1)
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1626 return SIG_ERR;
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1627 return context.sa_handler;
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1628 #else
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1629 PyOS_sighandler_t handler;
35961 72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1630 /* Special signal handling for the secure CRT in Visual Studio 2005 */
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1631 #if defined(_MSC_VER) && _MSC_VER >= 1400
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1632 switch (sig) {
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1633 /* Only these signals are valid */
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1634 case SIGINT:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1635 case SIGILL:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1636 case SIGFPE:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1637 case SIGSEGV:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1638 case SIGTERM:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1639 case SIGBREAK:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1640 case SIGABRT:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1641 break;
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1642 /* Don't call signal() with other values or it will assert */
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1643 default:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1644 return SIG_ERR;
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1645 }
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	1646 #endif /* _MSC_VER && _MSC_VER >= 1400 */
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1647 handler = signal(sig, SIG_IGN);
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1648 if (handler != SIG_ERR)
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1649 signal(sig, handler);
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1650 return handler;
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1651 #endif
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1652 }
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1653
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1654 PyOS_sighandler_t
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1655 PyOS_setsig(int sig, PyOS_sighandler_t handler)
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1656 {
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1657 #ifdef HAVE_SIGACTION
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1658 struct sigaction context, ocontext;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1659 context.sa_handler = handler;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1660 sigemptyset(&context.sa_mask);
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1661 context.sa_flags = 0;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1662 if (sigaction(sig, &context, &ocontext) == -1)
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1663 return SIG_ERR;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1664 return ocontext.sa_handler;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1665 #else
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1666 PyOS_sighandler_t oldhandler;
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1667 oldhandler = signal(sig, handler);
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1668 #ifdef HAVE_SIGINTERRUPT
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1669 siginterrupt(sig, 1);
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	1670 #endif
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1671 return oldhandler;
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1672 #endif
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	1673 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1674
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1675 /* Deprecated C API functions still provided for binary compatiblity */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1676
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1677 #undef PyParser_SimpleParseFile
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1678 #undef PyParser_SimpleParseString
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1679
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1680 node *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1681 PyParser_SimpleParseFile(FILE fp, const char filename, int start)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1682 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1683 return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1684 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1685
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1686 node *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1687 PyParser_SimpleParseString(const char *str, int start)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1688 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1689 return PyParser_SimpleParseStringFlags(str, start, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1690 }

Mercurial > cpython-lru_cache-weakref

annotate Python/pythonrun.c @ 36683:da2a1049215d legacy-trunk