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

annotate Python/pythonrun.c @ 68249:4cd9f5e89061 3.0

Close 3.0 branch.

author	Georg Brandl <georg@python.org>
date	Sat, 05 Mar 2011 15:09:43 +0100
parents	fa3b2ed20d85
children

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"
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	7 #undef Yield /* undefine macro conflicting with winbase.h */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "grammar.h"
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	9 #include "node.h"
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	10 #include "token.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	11 #include "parsetok.h"
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	12 #include "errcode.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	13 #include "code.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	14 #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	15 #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	16 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	17 #include "ast.h"
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 923 diff changeset	18 #include "eval.h"
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	19 #include "marshal.h"
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	20 #include "osdefs.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	21
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	22 #ifdef HAVE_SIGNAL_H
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	23 #include <signal.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	24 #endif
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	25
50559 6f30b97148b6 Merged revisions 68178 via svnmerge from Georg Brandl <georg@python.org> parents: 50558 diff changeset	26 #ifdef MS_WINDOWS
50558 fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	27 #include "malloc.h" /* for alloca */
50559 6f30b97148b6 Merged revisions 68178 via svnmerge from Georg Brandl <georg@python.org> parents: 50558 diff changeset	28 #endif
50558 fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	29
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	30 #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	31 #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	32 #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	33 #endif
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	34
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23252 diff changeset	35 #ifdef MS_WINDOWS
2529 16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	36 #undef BYTE
16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	37 #include "windows.h"
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	38 #define PATH_MAX MAXPATHLEN
2529 16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	39 #endif
16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	40
36837 3a3aed49b245 Use Py_ssize_t for _Py_RefTotal. Neal Norwitz <nnorwitz@gmail.com> parents: 36836 diff changeset	41 #ifndef Py_REF_DEBUG
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	42 #define PRINT_TOTAL_REFS()
36837 3a3aed49b245 Use Py_ssize_t for _Py_RefTotal. Neal Norwitz <nnorwitz@gmail.com> parents: 36836 diff changeset	43 #else /* Py_REF_DEBUG */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	44 #define PRINT_TOTAL_REFS() fprintf(stderr, \
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	45 "[%" PY_FORMAT_SIZE_T "d refs]\n", \
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	46 _Py_GetRefTotal())
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	47 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	48
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	49 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	50 extern "C" {
36837 3a3aed49b245 Use Py_ssize_t for _Py_RefTotal. Neal Norwitz <nnorwitz@gmail.com> parents: 36836 diff changeset	51 #endif
3a3aed49b245 Use Py_ssize_t for _Py_RefTotal. Neal Norwitz <nnorwitz@gmail.com> parents: 36836 diff changeset	52
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	53 extern wchar_t *Py_GetPath(void);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	54
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	55 extern grammar _PyParser_Grammar; /* From graminit.c */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	56
1391 7c3245c18677 * ceval.c, longobject.c, methodobject.c, listnode.c, arraymodule.c, Guido van Rossum <guido@python.org> parents: 1347 diff changeset	57 /* Forward */
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	58 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	59 static void initsite(void);
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	60 static int initstdio(void);
46395 6196529afd73 Add a NEWS entry for issue2221. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46318 diff changeset	61 static void flush_io(void);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	62 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	63 PyCompilerFlags , PyArena );
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	64 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	65 PyCompilerFlags *);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	66 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	67 static void initsigs(void);
41253 f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	68 static void call_py_exitfuncs(void);
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	69 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	70 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	71 extern void _PyUnicode_Fini(void);
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	72 extern int _PyLong_Init(void);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	73 extern void PyLong_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	74
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	75 #ifdef WITH_THREAD
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	76 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	77 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	78 #endif /* WITH_THREAD */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	79
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	80 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	81 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	82 int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	83 int Py_InspectFlag; /* Needed to determine whether to exit at SystemError */
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	84 int Py_NoSiteFlag; /* Suppress 'import site' */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	85 int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44486 diff changeset	86 int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (.py[co]) /
12555 04cf788d862b Py_UseClassExceptionsFlag is deprecated. We keep the C variable for C Barry Warsaw <barry@python.org> parents: 12539 diff changeset	87 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	88 int Py_FrozenFlag; /* Needed by getpath.c */
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	89 int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
46708 74b9c85361f8 Merged revisions 62774-62775,62785,62787-62788 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46694 diff changeset	90 int Py_NoUserSiteDirectory = 0; /* for -s and site.py */
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	91 int Py_UnbufferedStdioFlag = 0; /* Unbuffered binary std{in,out,err} */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	92
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46395 diff changeset	93 /* PyModule_GetWarningsModule is no longer necessary as of 2.6
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46395 diff changeset	94 since _warnings is builtin. This API should not be used. */
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46395 diff changeset	95 PyObject *
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46395 diff changeset	96 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	97 {
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46395 diff changeset	98 return PyImport_ImportModule("warnings");
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28720 diff changeset	99 }
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 27878 diff changeset	100
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	101 static int initialized = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	102
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	103 /* 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	104
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	105 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	106 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	107 {
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	108 return initialized;
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	109 }
57045f51dd12 Added new Py_IsInitalized() API function to test the 'initialized' flag. Guido van Rossum <guido@python.org> parents: 6117 diff changeset	110
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	111 /* 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	112 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	113 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	114 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	115 been created.
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	116
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	117 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	118 (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	119 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	120
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	121 */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	122
20401 b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	123 static int
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	124 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	125 {
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	126 int env = atoi(envs);
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	127 if (flag < env)
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	128 flag = env;
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	129 if (flag < 1)
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	130 flag = 1;
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	131 return flag;
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	132 }
b74610c92d8b SF patch #467455 : Enhanced environment variables, by Toby Dickenson. Guido van Rossum <guido@python.org> parents: 19633 diff changeset	133
49611 9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	134 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	135 static char*
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	136 get_codeset(void)
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	137 {
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	138 char* codeset;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	139 PyObject codec, name;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	140
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	141 codeset = nl_langinfo(CODESET);
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	142 if (!codeset \|\| codeset[0] == '\0')
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	143 return NULL;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	144
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	145 codec = _PyCodec_Lookup(codeset);
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	146 if (!codec)
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	147 goto error;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	148
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	149 name = PyObject_GetAttrString(codec, "name");
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	150 Py_CLEAR(codec);
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	151 if (!name)
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	152 goto error;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	153
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	154 codeset = strdup(_PyUnicode_AsString(name));
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	155 Py_DECREF(name);
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	156 return codeset;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	157
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	158 error:
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	159 Py_XDECREF(codec);
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	160 PyErr_Clear();
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	161 return NULL;
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	162 }
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	163 #endif
9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	164
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	165 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	166 Py_InitializeEx(int install_sigs)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	167 {
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	168 PyInterpreterState *interp;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	169 PyThreadState *tstate;
43718 e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	170 PyObject bimod, sysmod, *pstderr;
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	171 char *p;
41587 15b810e21fe9 Get rid of all #ifdef Py_USING_UNICODE (it is always present now). Guido van Rossum <guido@python.org> parents: 41558 diff changeset	172 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
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	173 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	174 #endif
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	175 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	176
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	177 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	178 return;
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	179 initialized = 1;
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	180
42539 43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	181 #ifdef HAVE_SETLOCALE
43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	182 /* Set up the LC_CTYPE locale, so we can obtain
43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	183 the locale's charset without having to switch
43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	184 locales. */
43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	185 setlocale(LC_CTYPE, "");
43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	186 #endif
43e32b2b4004 Set sys.stdout.encoding properly. Martin v. Löwis <martin@v.loewis.de> parents: 42180 diff changeset	187
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18630 diff changeset	188 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	189 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	190 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	191 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	192 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	193 Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44486 diff changeset	194 if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44486 diff changeset	195 Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, 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	196
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	197 interp = PyInterpreterState_New();
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	198 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	199 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	200
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	201 tstate = PyThreadState_New(interp);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	202 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	203 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	204 (void) PyThreadState_Swap(tstate);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	205
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	206 _Py_ReadyTypes();
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 18933 diff changeset	207
26923 dbfc3ef7d003 Since the _Init() are private, prefix with _, suggested by Skip Neal Norwitz <nnorwitz@gmail.com>* parents: 26889 diff changeset	208 if (!_PyFrame_Init())
26889 12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	209 Py_FatalError("Py_Initialize: can't init frames");
12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	210
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	211 if (!_PyLong_Init())
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	212 Py_FatalError("Py_Initialize: can't init longs");
26889 12753e7b15f7 SF #561244, Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 26885 diff changeset	213
47300 96b34263e448 Renamed PyBytes to PyByteArray Christian Heimes <christian@cheimes.de> parents: 47072 diff changeset	214 if (!PyByteArray_Init())
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40949 diff changeset	215 Py_FatalError("Py_Initialize: can't init bytes");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40949 diff changeset	216
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34834 diff changeset	217 _PyFloat_Init();
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34834 diff changeset	218
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	219 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	220 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	221 Py_FatalError("Py_Initialize: can't make modules dictionary");
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	222 interp->modules_reloading = PyDict_New();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	223 if (interp->modules_reloading == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	224 Py_FatalError("Py_Initialize: can't make modules_reloading dictionary");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	225
11977 8b88e1bc0e1b Marc-Andre Lemburg: add calls to initialize and finalize Unicode and Guido van Rossum <guido@python.org> parents: 11673 diff changeset	226 /* 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	227 _PyUnicode_Init();
8b88e1bc0e1b Marc-Andre Lemburg: add calls to initialize and finalize Unicode and Guido van Rossum <guido@python.org> parents: 11673 diff changeset	228
12754 5213abfe5230 Py_Initialize(): Now that standard exceptions are builtin, we don't Barry Warsaw <barry@python.org> parents: 12576 diff changeset	229 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	230 if (bimod == NULL)
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44066 diff changeset	231 Py_FatalError("Py_Initialize: can't initialize builtins modules");
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47496 diff changeset	232 _PyImport_FixupExtension(bimod, "builtins", "builtins");
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	233 interp->builtins = PyModule_GetDict(bimod);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	234 if (interp->builtins == NULL)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	235 Py_FatalError("Py_Initialize: can't initialize builtins dict");
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	236 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	237
43848 e162e881ea5f Moved the initalization of the exception before the initialization of sys. Christian Heimes <christian@cheimes.de> parents: 43842 diff changeset	238 /* initialize builtin exceptions */
e162e881ea5f Moved the initalization of the exception before the initialization of sys. Christian Heimes <christian@cheimes.de> parents: 43842 diff changeset	239 _PyExc_Init();
e162e881ea5f Moved the initalization of the exception before the initialization of sys. Christian Heimes <christian@cheimes.de> parents: 43842 diff changeset	240
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	241 sysmod = _PySys_Init();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	242 if (sysmod == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	243 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	244 interp->sysdict = PyModule_GetDict(sysmod);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	245 if (interp->sysdict == NULL)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	246 Py_FatalError("Py_Initialize: can't initialize sys dict");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	247 Py_INCREF(interp->sysdict);
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47496 diff changeset	248 _PyImport_FixupExtension(sysmod, "sys", "sys");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	249 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	250 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	251 interp->modules);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	252
43718 e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	253 /* Set up a preliminary stderr printer until we have enough
e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	254 infrastructure for the io module in place. */
e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	255 pstderr = PyFile_NewStdPrinter(fileno(stderr));
e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	256 if (pstderr == NULL)
e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	257 Py_FatalError("Py_Initialize: can't set preliminary stderr");
e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	258 PySys_SetObject("stderr", pstderr);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	259 PySys_SetObject("__stderr__", pstderr);
43718 e510b716bd80 Patch 1352 (continued in issue 1329) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43712 diff changeset	260
11113 be8ec828c072 Marc-Andre Lemburg discovered that the switch from .pyc to .pyo files, Guido van Rossum <guido@python.org> parents: 10534 diff changeset	261 _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	262
26885 54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26643 diff changeset	263 _PyImportHooks_Init();
54aacb87beda PEP 302 + zipimport: Just van Rossum <just@letterror.com> parents: 26643 diff changeset	264
33189 de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	265 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	266 initsigs(); /* Signal handling stuff, including initintr() */
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46395 diff changeset	267
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	268 /* Initialize warnings. */
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	269 _PyWarnings_Init();
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	270 if (PySys_HasWarnOptions()) {
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	271 PyObject *warnings_module = PyImport_ImportModule("warnings");
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	272 if (!warnings_module)
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	273 PyErr_Clear();
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	274 Py_XDECREF(warnings_module);
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	275 }
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	276
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	277 initmain(); /* Module __main__ */
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	278 if (initstdio() < 0)
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	279 Py_FatalError(
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	280 "Py_Initialize: can't initialize sys standard streams");
49035 dab7abb77e8f compile _bytesio and _stringio into the binary and initalize stdio before site fixing #3279 Benjamin Peterson <benjamin@python.org> parents: 48874 diff changeset	281 if (!Py_NoSiteFlag)
dab7abb77e8f compile _bytesio and _stringio into the binary and initalize stdio before site fixing #3279 Benjamin Peterson <benjamin@python.org> parents: 48874 diff changeset	282 initsite(); /* Module site */
28065 c61ef183ce2f Addendum to #683658: Just van Rossum <just@letterror.com> parents: 27958 diff changeset	283
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	284 /* 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	285 #ifdef WITH_THREAD
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	286 _PyGILState_Init(interp, tstate);
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	287 #endif /* WITH_THREAD */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28653 diff changeset	288
41587 15b810e21fe9 Get rid of all #ifdef Py_USING_UNICODE (it is always present now). Guido van Rossum <guido@python.org> parents: 41558 diff changeset	289 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
28174 3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	290 /* 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	291 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	292 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	293 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	294 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	295
49611 9fc573fbaf5e Issue #4213: The file system encoding is now normalized by the codec subsystem, for example UTF-8 is turned into utf-8. Christian Heimes <christian@cheimes.de> parents: 49035 diff changeset	296 codeset = get_codeset();
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	297 if (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	298 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	299 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	300 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	301 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	302 }
3f90d21debe9 Always initialize Py_FileSystemDefaultEncoding on Unix in Py_Initialize, Martin v. Löwis <martin@v.loewis.de> parents: 28065 diff changeset	303 #endif
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	304 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	305
33189 de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	306 void
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	307 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	308 {
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	309 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	310 }
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	311
de804edf8bcd Patch #900727: Add Py_InitializeEx to allow embedding without signals. Martin v. Löwis <martin@v.loewis.de> parents: 32781 diff changeset	312
9641 d152adf3f094 Move the prototype for dump_counts() to before where it is used. Guido van Rossum <guido@python.org> parents: 9285 diff changeset	313 #ifdef COUNT_ALLOCS
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	314 extern void dump_counts(FILE*);
9641 d152adf3f094 Move the prototype for dump_counts() to before where it is used. Guido van Rossum <guido@python.org> parents: 9285 diff changeset	315 #endif
d152adf3f094 Move the prototype for dump_counts() to before where it is used. Guido van Rossum <guido@python.org> parents: 9285 diff changeset	316
42167 29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	317 /* Flush stdout and stderr */
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	318
42893 2c02ba72714b Make some internal functions static Neal Norwitz <nnorwitz@gmail.com> parents: 42822 diff changeset	319 static void
42180 9f99ea4f81e9 Silence compiler warning. Guido van Rossum <guido@python.org> parents: 42167 diff changeset	320 flush_std_files(void)
42167 29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	321 {
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	322 PyObject *fout = PySys_GetObject("stdout");
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	323 PyObject *ferr = PySys_GetObject("stderr");
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	324 PyObject *tmp;
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	325
43855 ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	326 if (fout != NULL && fout != Py_None) {
42167 29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	327 tmp = PyObject_CallMethod(fout, "flush", "");
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	328 if (tmp == NULL)
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	329 PyErr_Clear();
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	330 else
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	331 Py_DECREF(tmp);
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	332 }
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	333
43855 ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	334 if (ferr != NULL \|\| ferr != Py_None) {
42167 29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	335 tmp = PyObject_CallMethod(ferr, "flush", "");
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	336 if (tmp == NULL)
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	337 PyErr_Clear();
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	338 else
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	339 Py_DECREF(tmp);
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	340 }
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	341 }
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	342
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	343 /* 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	344
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	345 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	346 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	347 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	348 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	349
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	350 (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	351 threads.)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	352
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	353 Locking: as above.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	354
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	355 */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	356
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	357 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	358 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	359 {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	360 PyInterpreterState *interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	361 PyThreadState *tstate;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	362
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	363 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	364 return;
16073 713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	365
713ed6c6bcb5 Bug #128475: mimetools.encode (sometimes) fails when called from a thread. Tim Peters <tim.peters@gmail.com> parents: 15963 diff changeset	366 /* 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	367 * 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	368 * 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	369 * 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	370 * 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	371 * 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	372 * 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	373 * 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	374 */
41253 f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	375 call_py_exitfuncs();
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	376 initialized = 0;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	377
42167 29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	378 /* Flush stdout+stderr */
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	379 flush_std_files();
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	380
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	381 /* 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	382 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	383 interp = tstate->interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	384
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	385 /* Disable signal handling */
724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	386 PyOS_FiniInterrupts();
724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	387
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	388 /* Clear type lookup cache */
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	389 PyType_ClearCache();
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	390
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	391 /* 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	392 * 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	393 * 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	394 * 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	395 * 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	396 * 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	397 * 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	398 * 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	399 * 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	400 * 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	401 * XXX I haven't seen a real-life report of either of these.
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	402 */
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	403 PyGC_Collect();
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	404 #ifdef COUNT_ALLOCS
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	405 /* With COUNT_ALLOCS, it helps to run GC multiple times:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	406 each collection might release some types from the type
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	407 list, so they become garbage. */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	408 while (PyGC_Collect() > 0)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	409 /* nothing */;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	410 #endif
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	411
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	412 /* 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	413 PyImport_Cleanup();
6547 724382af5339 Two independent changes (alas): Guido van Rossum <guido@python.org> parents: 6376 diff changeset	414
42167 29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	415 /* Flush stdout+stderr (again, in case more was printed) */
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	416 flush_std_files();
29ba6c399090 Upon exit, flush stdout and stderr (twice: before and after the code that Guido van Rossum <guido@python.org> parents: 42071 diff changeset	417
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	418 /* 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	419 * 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	420 * 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	421 * 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	422 * 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	423 * 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	424 * 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	425 * 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	426 * 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	427 * 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	428 * 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	429 * 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	430 * 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	431 * 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	432 */
f69589179c55 Py_Finalize(): disabled the second call of cyclic gc, and added extensive Tim Peters <tim.peters@gmail.com> parents: 30979 diff changeset	433 #if 0
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	434 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	435 #endif
28651 7fda09f751ad - New C API PyGC_Collect(), same as calling gc.collect(). Guido van Rossum <guido@python.org> parents: 28649 diff changeset	436
6786 bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	437 /* 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	438 _PyImport_Fini();
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	439
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	440 /* Debugging stuff */
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	441 #ifdef COUNT_ALLOCS
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	442 dump_counts(stdout);
6786 bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	443 #endif
bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	444
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	445 PRINT_TOTAL_REFS();
6786 bc007cf1d6ba Changed the finalization order again so that the reference count Guido van Rossum <guido@python.org> parents: 6661 diff changeset	446
28647 9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	447 #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	448 /* 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	449 * __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	450 * 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	451 * up later.
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	452 */
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	453 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	454 _Py_PrintReferences(stderr);
9d4e138494fb Py_Finalize(): Reverted recent changes that tried to move the Tim Peters <tim.peters@gmail.com> parents: 28616 diff changeset	455 #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	456
28613 b1671550c7e1 Move the call to _Py_PrintReferences() a bit further down. This Guido van Rossum <guido@python.org> parents: 28574 diff changeset	457 /* 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	458 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	459
34834 7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	460 /* 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	461 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	462 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	463 raised.
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	464 */
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	465
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	466 _PyExc_Fini();
7cfda9898863 Move exception finalisation later in the shutdown process - this Anthony Baxter <anthonybaxter@gmail.com> parents: 34664 diff changeset	467
44066 28c802837252 Merged revisions 59226-59233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44064 diff changeset	468 /* Cleanup auto-thread-state */
28c802837252 Merged revisions 59226-59233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44064 diff changeset	469 #ifdef WITH_THREAD
28c802837252 Merged revisions 59226-59233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44064 diff changeset	470 _PyGILState_Fini();
28c802837252 Merged revisions 59226-59233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44064 diff changeset	471 #endif /* WITH_THREAD */
28c802837252 Merged revisions 59226-59233 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44064 diff changeset	472
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	473 /* 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	474 PyThreadState_Swap(NULL);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	475 PyInterpreterState_Delete(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	476
28613 b1671550c7e1 Move the call to _Py_PrintReferences() a bit further down. This Guido van Rossum <guido@python.org> parents: 28574 diff changeset	477 /* 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	478 PyMethod_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	479 PyFrame_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	480 PyCFunction_Fini();
2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	481 PyTuple_Fini();
33679 55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33189 diff changeset	482 PyList_Fini();
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 34972 diff changeset	483 PySet_Fini();
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	484 PyBytes_Fini();
47300 96b34263e448 Renamed PyBytes to PyByteArray Christian Heimes <christian@cheimes.de> parents: 47072 diff changeset	485 PyByteArray_Fini();
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	486 PyLong_Fini();
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	487 PyFloat_Fini();
45244 2a821e001a2b Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617-60678 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	488 PyDict_Fini();
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	489
22883 d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	490 /* Cleanup Unicode implementation */
d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	491 _PyUnicode_Fini();
d8bc68cb17e0 Move Unicode finalization further down in the chain. Marc-André Lemburg <mal@egenix.com> parents: 22721 diff changeset	492
44064 00048fedbaa0 Partial fix for bug #1306 Christian Heimes <christian@cheimes.de> parents: 43866 diff changeset	493 /* reset file system default encoding */
00048fedbaa0 Partial fix for bug #1306 Christian Heimes <christian@cheimes.de> parents: 43866 diff changeset	494 if (!Py_HasFileSystemDefaultEncoding) {
00048fedbaa0 Partial fix for bug #1306 Christian Heimes <christian@cheimes.de> parents: 43866 diff changeset	495 free((char*)Py_FileSystemDefaultEncoding);
45914 4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	496 Py_FileSystemDefaultEncoding = NULL;
44064 00048fedbaa0 Partial fix for bug #1306 Christian Heimes <christian@cheimes.de> parents: 43866 diff changeset	497 }
00048fedbaa0 Partial fix for bug #1306 Christian Heimes <christian@cheimes.de> parents: 43866 diff changeset	498
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	499 /* 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	500 - 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	501 - 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	502 - 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	503 */
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 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	506
28653 56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	507 #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	508 /* 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	509 * 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	510 * 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	511 */
56006d97bcef _Py_PrintReferences(): Changed to print object address at start of each Tim Peters <tim.peters@gmail.com> parents: 28651 diff changeset	512 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	513 _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	514 #endif /* Py_TRACE_REFS */
23020 e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	515 #ifdef PYMALLOC_DEBUG
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	516 if (Py_GETENV("PYTHONMALLOCSTATS"))
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	517 _PyObject_DebugMallocStats();
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	518 #endif
e2848618bd19 _PyObject_DebugDumpStats: renamed to _PyObject_DebugMallocStats. Tim Peters <tim.peters@gmail.com> parents: 22883 diff changeset	519
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	520 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	521 }
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 /* 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	524 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	525 first.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	526
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	527 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	528 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	529 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	530 thread.
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 Locking: as above.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	533
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	534 */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	535
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	536 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	537 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	538 {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	539 PyInterpreterState *interp;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	540 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	541 PyObject bimod, sysmod;
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 if (!initialized)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	544 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	545
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	546 interp = PyInterpreterState_New();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	547 if (interp == NULL)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	548 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	549
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	550 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	551 if (tstate == NULL) {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	552 PyInterpreterState_Delete(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	553 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	554 }
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 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	557
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	558 /* 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	559
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	560 interp->modules = PyDict_New();
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	561 interp->modules_reloading = PyDict_New();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	562
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44066 diff changeset	563 bimod = _PyImport_FindExtension("builtins", "builtins");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	564 if (bimod != NULL) {
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	565 interp->builtins = PyModule_GetDict(bimod);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	566 if (interp->builtins == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	567 goto handle_error;
6557 b331cd47e0bc Undo half of the previous change :-( Guido van Rossum <guido@python.org> parents: 6547 diff changeset	568 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	569 }
49613 efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	570
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	571 /* initialize builtin exceptions */
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	572 _PyExc_Init();
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	573
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	574 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	575 if (bimod != NULL && sysmod != NULL) {
49613 efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	576 PyObject *pstderr;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	577 interp->sysdict = PyModule_GetDict(sysmod);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	578 if (interp->sysdict == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	579 goto handle_error;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	580 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	581 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	582 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	583 interp->modules);
49613 efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	584 /* Set up a preliminary stderr printer until we have enough
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	585 infrastructure for the io module in place. */
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	586 pstderr = PyFile_NewStdPrinter(fileno(stderr));
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	587 if (pstderr == NULL)
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	588 Py_FatalError("Py_Initialize: can't set preliminary stderr");
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	589 PySys_SetObject("stderr", pstderr);
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	590 PySys_SetObject("__stderr__", pstderr);
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	591
27340 8b53b0ce06d4 Patch #671459: Invoke import hooks in Py_NewInterpreter. Martin v. Löwis <martin@v.loewis.de> parents: 26923 diff changeset	592 _PyImportHooks_Init();
49613 efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	593 if (initstdio() < 0)
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	594 Py_FatalError(
efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 49611 diff changeset	595 "Py_Initialize: can't initialize sys standard streams");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	596 initmain();
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	597 if (!Py_NoSiteFlag)
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	598 initsite();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	599 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	600
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	601 if (!PyErr_Occurred())
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	602 return tstate;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	603
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	604 handle_error:
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	605 /* 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	606
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	607 PyErr_Print();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	608 PyThreadState_Clear(tstate);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	609 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	610 PyThreadState_Delete(tstate);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	611 PyInterpreterState_Delete(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	612
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	613 return NULL;
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	614 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	615
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	616 /* 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	617 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	618 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	619 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	620
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	621 (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	622 everything, regardless.)
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	623
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	624 Locking: as above.
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	625
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	626 */
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	627
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	628 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	629 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	630 {
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	631 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	632
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31771 diff changeset	633 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	634 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	635 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	636 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	637 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	638 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	639
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	640 PyImport_Cleanup();
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	641 PyInterpreterState_Clear(interp);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	642 PyThreadState_Swap(NULL);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	643 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	644 }
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	645
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	646 static wchar_t *progname = L"python";
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	647
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	648 void
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	649 Py_SetProgramName(wchar_t *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	650 {
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	651 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	652 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	653 }
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	654
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	655 wchar_t *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	656 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	657 {
6f67a1bda15a Moved some stuff here from main.c (part of a big restructuring - wait Guido van Rossum <guido@python.org> parents: 5611 diff changeset	658 return progname;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	659 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5234 diff changeset	660
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	661 static wchar_t *default_home = NULL;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	662 static wchar_t env_home[PATH_MAX+1];
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	663
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	664 void
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	665 Py_SetPythonHome(wchar_t *home)
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	666 {
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	667 default_home = home;
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	668 }
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	669
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	670 wchar_t *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	671 Py_GetPythonHome(void)
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	672 {
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	673 wchar_t *home = default_home;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	674 if (home == NULL && !Py_IgnoreEnvironmentFlag) {
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	675 char* chome = Py_GETENV("PYTHONHOME");
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	676 if (chome) {
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	677 size_t r = mbstowcs(env_home, chome, PATH_MAX+1);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	678 if (r != (size_t)-1 && r <= PATH_MAX)
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	679 home = env_home;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	680 }
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	681
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46299 diff changeset	682 }
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	683 return home;
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	684 }
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	685
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	686 /* Create __main__ module */
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	687
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	688 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	689 initmain(void)
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	690 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	691 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	692 m = PyImport_AddModule("__main__");
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	693 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	694 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	695 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	696 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44066 diff changeset	697 PyObject *bimod = PyImport_ImportModule("builtins");
6600 83ccf44bf195 Two changes (here we go again :-( ). Guido van Rossum <guido@python.org> parents: 6557 diff changeset	698 if (bimod == NULL \|\|
83ccf44bf195 Two changes (here we go again :-( ). Guido van Rossum <guido@python.org> parents: 6557 diff changeset	699 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	700 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	701 Py_DECREF(bimod);
2098 b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	702 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	703 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	704
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	705 /* Import the site module (not into __main__ though) */
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	706
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	707 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	708 initsite(void)
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	709 {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	710 PyObject m, f;
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	711 m = PyImport_ImportModule("site");
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	712 if (m == NULL) {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	713 f = PySys_GetObject("stderr");
43855 ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	714 if (f == NULL \|\| f == Py_None)
ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	715 return;
6201 dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	716 if (Py_VerboseFlag) {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	717 PyFile_WriteString(
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	718 "'import site' failed; traceback:\n", f);
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	719 PyErr_Print();
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	720 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	721 else {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	722 PyFile_WriteString(
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	723 "'import site' failed; use -v for traceback\n", f);
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	724 PyErr_Clear();
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	725 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	726 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	727 else {
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	728 Py_DECREF(m);
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	729 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	730 }
dc974b3a6cf4 Two independent changes (oops): Guido van Rossum <guido@python.org> parents: 6197 diff changeset	731
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	732 static PyObject*
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	733 create_stdio(PyObject* io,
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	734 int fd, int write_mode, char* name,
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	735 char* encoding, char* errors)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	736 {
50678 9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	737 PyObject buf = NULL, stream = NULL, text = NULL, raw = NULL, *res;
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	738 const char* mode;
50678 9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	739 PyObject *line_buffering;
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	740 int buffering, isatty;
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	741
51082 14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	742 /* stdin is always opened in buffered mode, first because it shouldn't
14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	743 make a difference in common use cases, second because TextIOWrapper
14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	744 depends on the presence of a read1() method which only exists on
14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	745 buffered streams.
14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	746 */
14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	747 if (Py_UnbufferedStdioFlag && write_mode)
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	748 buffering = 0;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	749 else
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	750 buffering = -1;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	751 if (write_mode)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	752 mode = "wb";
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	753 else
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	754 mode = "rb";
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	755 buf = PyObject_CallMethod(io, "open", "isiOOOi",
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	756 fd, mode, buffering,
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	757 Py_None, Py_None, Py_None, 0);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	758 if (buf == NULL)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	759 goto error;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	760
51082 14c3ab9bd706 Merged revisions 68977,68981 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50678 diff changeset	761 if (buffering) {
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	762 raw = PyObject_GetAttrString(buf, "raw");
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	763 if (raw == NULL)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	764 goto error;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	765 }
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	766 else {
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	767 raw = buf;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	768 Py_INCREF(raw);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	769 }
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	770
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	771 text = PyUnicode_FromString(name);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	772 if (text == NULL \|\| PyObject_SetAttrString(raw, "_name", text) < 0)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	773 goto error;
50678 9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	774 res = PyObject_CallMethod(raw, "isatty", "");
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	775 if (res == NULL)
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	776 goto error;
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	777 isatty = PyObject_IsTrue(res);
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	778 Py_DECREF(res);
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	779 if (isatty == -1)
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	780 goto error;
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	781 if (isatty \|\| Py_UnbufferedStdioFlag)
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	782 line_buffering = Py_True;
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	783 else
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	784 line_buffering = Py_False;
9c2bd647b646 Merged revisions 68463 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50666 diff changeset	785
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	786 Py_CLEAR(raw);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	787 Py_CLEAR(text);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	788
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	789 stream = PyObject_CallMethod(io, "TextIOWrapper", "OsssO",
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	790 buf, encoding, errors,
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	791 "\n", line_buffering);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	792 Py_CLEAR(buf);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	793 if (stream == NULL)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	794 goto error;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	795
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	796 if (write_mode)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	797 mode = "w";
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	798 else
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	799 mode = "r";
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	800 text = PyUnicode_FromString(mode);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	801 if (!text \|\| PyObject_SetAttrString(stream, "mode", text) < 0)
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	802 goto error;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	803 Py_CLEAR(text);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	804 return stream;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	805
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	806 error:
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	807 Py_XDECREF(buf);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	808 Py_XDECREF(stream);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	809 Py_XDECREF(text);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	810 Py_XDECREF(raw);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	811 return NULL;
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	812 }
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	813
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44066 diff changeset	814 /* Initialize sys.stdin, stdout, stderr and builtins.open */
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	815 static int
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	816 initstdio(void)
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	817 {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	818 PyObject iomod = NULL, wrapper;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	819 PyObject *bimod = NULL;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	820 PyObject *m;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	821 PyObject *std = NULL;
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	822 int status = 0, fd;
45914 4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	823 PyObject * encoding_attr;
47599 e2eb70235392 Issue 1342: Python could not start if installed in a directory Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	824 char encoding = NULL, errors;
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	825
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	826 /* Hack to avoid a nasty recursion issue when Python is invoked
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	827 in verbose mode: pre-import the Latin-1 and UTF-8 codecs */
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	828 if ((m = PyImport_ImportModule("encodings.utf_8")) == NULL) {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	829 goto error;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	830 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	831 Py_DECREF(m);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	832
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	833 if (!(m = PyImport_ImportModule("encodings.latin_1"))) {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	834 goto error;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	835 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	836 Py_DECREF(m);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	837
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44066 diff changeset	838 if (!(bimod = PyImport_ImportModule("builtins"))) {
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	839 goto error;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	840 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	841
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	842 if (!(iomod = PyImport_ImportModule("io"))) {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	843 goto error;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	844 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	845 if (!(wrapper = PyObject_GetAttrString(iomod, "OpenWrapper"))) {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	846 goto error;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	847 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	848
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 44066 diff changeset	849 /* Set builtins.open */
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	850 if (PyObject_SetAttrString(bimod, "open", wrapper) == -1) {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	851 goto error;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	852 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	853
47444 bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	854 encoding = Py_GETENV("PYTHONIOENCODING");
47446 b6b534b828b3 Fix uninitialized variable access, release memory. Martin v. Löwis <martin@v.loewis.de> parents: 47444 diff changeset	855 errors = NULL;
47444 bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	856 if (encoding) {
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	857 encoding = strdup(encoding);
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	858 errors = strchr(encoding, ':');
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	859 if (errors) {
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	860 *errors = '\0';
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	861 errors++;
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	862 }
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	863 }
bb2c4bdc3c68 Forward-port PYTHONIOENCODING. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	864
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	865 /* Set sys.stdin */
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	866 fd = fileno(stdin);
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	867 /* Under some conditions stdin, stdout and stderr may not be connected
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	868 * and fileno() may point to an invalid file descriptor. For example
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	869 * GUI apps don't have valid standard streams by default.
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	870 */
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	871 if (fd < 0) {
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	872 #ifdef MS_WINDOWS
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	873 std = Py_None;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	874 Py_INCREF(std);
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	875 #else
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	876 goto error;
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	877 #endif
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	878 }
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	879 else {
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	880 std = create_stdio(iomod, fd, 0, "<stdin>", encoding, errors);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	881 if (std == NULL)
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	882 goto error;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	883 } /* if (fd < 0) */
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	884 PySys_SetObject("__stdin__", std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	885 PySys_SetObject("stdin", std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	886 Py_DECREF(std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	887
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	888 /* Set sys.stdout */
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	889 fd = fileno(stdout);
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	890 if (fd < 0) {
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	891 #ifdef MS_WINDOWS
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	892 std = Py_None;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	893 Py_INCREF(std);
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	894 #else
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	895 goto error;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	896 #endif
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	897 }
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	898 else {
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	899 std = create_stdio(iomod, fd, 1, "<stdout>", encoding, errors);
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	900 if (std == NULL)
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	901 goto error;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	902 } /* if (fd < 0) */
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	903 PySys_SetObject("__stdout__", std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	904 PySys_SetObject("stdout", std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	905 Py_DECREF(std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	906
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	907 #if 1 /* Disable this if you have trouble debugging bootstrap stuff */
43712 00b136b7da84 Patch 1329 (partial) by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43632 diff changeset	908 /* Set sys.stderr, replaces the preliminary stderr */
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	909 fd = fileno(stderr);
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	910 if (fd < 0) {
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	911 #ifdef MS_WINDOWS
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	912 std = Py_None;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	913 Py_INCREF(std);
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	914 #else
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	915 goto error;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	916 #endif
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	917 }
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	918 else {
50666 b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	919 std = create_stdio(iomod, fd, 1, "<stderr>", encoding, "backslashreplace");
b98fe8dc8acd Merged revisions 68451 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50559 diff changeset	920 if (std == NULL)
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	921 goto error;
ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	922 } /* if (fd < 0) */
45914 4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	923
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	924 /* Same as hack above, pre-import stderr's codec to avoid recursion
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	925 when import.c tries to write to stderr in verbose mode. */
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	926 encoding_attr = PyObject_GetAttrString(std, "encoding");
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	927 if (encoding_attr != NULL) {
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	928 const char * encoding;
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	929 encoding = _PyUnicode_AsString(encoding_attr);
45914 4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	930 if (encoding != NULL) {
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	931 _PyCodec_Lookup(encoding);
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	932 }
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	933 }
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	934 PyErr_Clear(); /* Not a fatal error if codec isn't available */
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	935
43842 241281123fd8 Fixed space -> tab Christian Heimes <christian@cheimes.de> parents: 43841 diff changeset	936 PySys_SetObject("__stderr__", std);
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	937 PySys_SetObject("stderr", std);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	938 Py_DECREF(std);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	939 #endif
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	940
43841 ccceaec11442 Fix for #1415 pythonw.exe fails because std streams a missing Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	941 if (0) {
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	942 error:
43842 241281123fd8 Fixed space -> tab Christian Heimes <christian@cheimes.de> parents: 43841 diff changeset	943 status = -1;
241281123fd8 Fixed space -> tab Christian Heimes <christian@cheimes.de> parents: 43841 diff changeset	944 }
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	945
47446 b6b534b828b3 Fix uninitialized variable access, release memory. Martin v. Löwis <martin@v.loewis.de> parents: 47444 diff changeset	946 if (encoding)
b6b534b828b3 Fix uninitialized variable access, release memory. Martin v. Löwis <martin@v.loewis.de> parents: 47444 diff changeset	947 free(encoding);
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	948 Py_XDECREF(bimod);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	949 Py_XDECREF(iomod);
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	950 return status;
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	951 }
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	952
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	953 /* Parse input from a file and execute it */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	954
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	955 int
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	956 PyRun_AnyFileExFlags(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	957 PyCompilerFlags *flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	958 {
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	959 if (filename == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	960 filename = "???";
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	961 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	962 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	963 if (closeit)
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	964 fclose(fp);
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	965 return err;
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	966 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	967 else
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	968 return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	969 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	970
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	971 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	972 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	973 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	974 PyObject *v;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	975 int ret;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	976 PyCompilerFlags local_flags;
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16845 diff changeset	977
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	978 if (flags == NULL) {
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	979 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	980 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	981 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	982 v = PySys_GetObject("ps1");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	983 if (v == NULL) {
42822 302aeee32da8 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42597 diff changeset	984 PySys_SetObject("ps1", v = PyUnicode_FromString(">>> "));
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	985 Py_XDECREF(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	986 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	987 v = PySys_GetObject("ps2");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	988 if (v == NULL) {
42822 302aeee32da8 Use unicode Neal Norwitz <nnorwitz@gmail.com> parents: 42597 diff changeset	989 PySys_SetObject("ps2", v = PyUnicode_FromString("... "));
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	990 Py_XDECREF(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	991 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	992 for (;;) {
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	993 ret = PyRun_InteractiveOneFlags(fp, filename, flags);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	994 PRINT_TOTAL_REFS();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	995 if (ret == E_EOF)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	996 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	997 /*
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	998 if (ret == E_NOMEM)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	999 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1000 */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1001 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1002 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1003
22468 eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22121 diff changeset	1004 /* 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	1005 #define PARSER_FLAGS(flags) \
36726 bbf16fd024df from __future__ import with_statement addon for 'with', mostly written by Thomas Wouters <thomas@python.org> parents: 36662 diff changeset	1006 ((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36881 diff changeset	1007 PyPARSE_DONT_IMPLY_DEDENT : 0)) : 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	1008
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1009 #if 0
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1010 /* Keep an example of flags with future keyword support. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1011 #define PARSER_FLAGS(flags) \
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1012 ((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1013 PyPARSE_DONT_IMPLY_DEDENT : 0) \
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1014 \| ((flags)->cf_flags & CO_FUTURE_WITH_STATEMENT ? \
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1015 PyPARSE_WITH_IS_KEYWORD : 0)) : 0)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1016 #endif
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1017
16916 b0456d3a0f1f Useful future statement support for the interactive interpreter Jeremy Hylton <jeremy@alum.mit.edu> parents: 16845 diff changeset	1018 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1019 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	1020 {
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1021 PyObject m, d, v, w, *oenc = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1022 mod_ty mod;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1023 PyArena *arena;
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1024 char ps1 = "", ps2 = "", *enc = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1025 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	1026
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1027 if (fp == stdin) {
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1028 /* Fetch encoding from sys.stdin */
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1029 v = PySys_GetObject("stdin");
43855 ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	1030 if (v == NULL \|\| v == Py_None)
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1031 return -1;
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1032 oenc = PyObject_GetAttrString(v, "encoding");
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1033 if (!oenc)
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1034 return -1;
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1035 enc = _PyUnicode_AsString(oenc);
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1036 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1037 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	1038 if (v != NULL) {
43866 8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the Thomas Heller <theller@ctypes.org> parents: 43855 diff changeset	1039 v = PyObject_Str(v);
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	1040 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	1041 PyErr_Clear();
43525 b9d19d51de36 get rid of some more PyString uses. Guido van Rossum <guido@python.org> parents: 43225 diff changeset	1042 else if (PyUnicode_Check(v))
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1043 ps1 = _PyUnicode_AsString(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1044 }
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	1045 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	1046 if (w != NULL) {
43866 8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the Thomas Heller <theller@ctypes.org> parents: 43855 diff changeset	1047 w = PyObject_Str(w);
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	1048 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	1049 PyErr_Clear();
43525 b9d19d51de36 get rid of some more PyString uses. Guido van Rossum <guido@python.org> parents: 43225 diff changeset	1050 else if (PyUnicode_Check(w))
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1051 ps2 = _PyUnicode_AsString(w);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1052 }
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1053 arena = PyArena_New();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1054 if (arena == NULL) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1055 Py_XDECREF(v);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1056 Py_XDECREF(w);
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1057 Py_XDECREF(oenc);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1058 return -1;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1059 }
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1060 mod = PyParser_ASTFromFile(fp, filename, enc,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1061 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	1062 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	1063 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	1064 Py_XDECREF(w);
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1065 Py_XDECREF(oenc);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1066 if (mod == NULL) {
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1067 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1068 if (errcode == E_EOF) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1069 PyErr_Clear();
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1070 return E_EOF;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1071 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1072 PyErr_Print();
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1073 return -1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1074 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1075 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	1076 if (m == NULL) {
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1077 PyArena_Free(arena);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1078 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	1079 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1080 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	1081 v = run_mod(mod, filename, d, d, flags, arena);
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1082 PyArena_Free(arena);
46395 6196529afd73 Add a NEWS entry for issue2221. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46318 diff changeset	1083 flush_io();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1084 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	1085 PyErr_Print();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1086 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1087 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1088 Py_DECREF(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1089 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1090 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1091
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	1092 /* 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	1093 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	1094
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	1095 static int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1096 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	1097 {
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	1098 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	1099 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	1100
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	1101 /* 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	1102 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	1103 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	1104 /* 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	1105 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	1106 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	1107 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	1108 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	1109 /* 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	1110 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	1111 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	1112 and a x-platform nightmare.
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	1113 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	1114 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	1115 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	1116 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	1117 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	1118 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	1119 */
e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	1120 int ispyc = 0;
16648 a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	1121 if (ftell(fp) == 0) {
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	1122 if (fread(buf, 1, 2, fp) == 2 &&
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1123 ((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	1124 ispyc = 1;
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	1125 rewind(fp);
a51b9961f3bb Bug #132850 unix line terminator on windows. Tim Peters <tim.peters@gmail.com> parents: 16560 diff changeset	1126 }
16560 e8e636cc1a09 Ugly fix for SF bug 131239 (-x flag busted). Tim Peters <tim.peters@gmail.com> parents: 16421 diff changeset	1127 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	1128 }
76caf0855d1f Recognize pyc files even if they don't end in pyc. Martin v. Löwis <martin@v.loewis.de> parents: 14637 diff changeset	1129 return 0;
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1130 }
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	1131
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	1132 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1133 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	1134 PyCompilerFlags *flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1135 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1136 PyObject m, d, *v;
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1137 const char *ext;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1138 int set_file_name = 0, ret;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1139
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1140 m = PyImport_AddModule("__main__");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1141 if (m == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1142 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	1143 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	1144 if (PyDict_GetItemString(d, "__file__") == NULL) {
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43525 diff changeset	1145 PyObject *f;
19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43525 diff changeset	1146 f = PyUnicode_DecodeFSDefault(filename);
25827 093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	1147 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	1148 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	1149 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	1150 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	1151 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	1152 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1153 set_file_name = 1;
25827 093fe5b9f6f9 If we have a filename and __main__.__file__ hasn't already been set, Fred Drake <fdrake@acm.org> parents: 25573 diff changeset	1154 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	1155 }
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1156 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	1157 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	1158 /* 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	1159 if (closeit)
20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	1160 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	1161 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	1162 fprintf(stderr, "python: Can't reopen .pyc file\n");
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1163 ret = -1;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1164 goto done;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1165 }
5234 07ed52e200db Allow passing a .pyo file. Guido van Rossum <guido@python.org> parents: 5170 diff changeset	1166 /* 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	1167 if (strcmp(ext, ".pyo") == 0)
07ed52e200db Allow passing a .pyo file. Guido van Rossum <guido@python.org> parents: 5170 diff changeset	1168 Py_OptimizeFlag = 1;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1169 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	1170 } else {
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1171 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	1172 closeit, flags);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1173 }
46395 6196529afd73 Add a NEWS entry for issue2221. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46318 diff changeset	1174 flush_io();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1175 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	1176 PyErr_Print();
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1177 ret = -1;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1178 goto done;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1179 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1180 Py_DECREF(v);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1181 ret = 0;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1182 done:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1183 if (set_file_name && PyDict_DelItemString(d, "__file__"))
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1184 PyErr_Clear();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1185 return ret;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1186 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1187
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1188 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1189 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	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 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	1192 m = PyImport_AddModule("__main__");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1193 if (m == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1194 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	1195 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	1196 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	1197 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	1198 PyErr_Print();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1199 return -1;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1200 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1201 Py_DECREF(v);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1202 return 0;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1203 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1204
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1205 static int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1206 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	1207 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	1208 {
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1209 long hold;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1210 PyObject *v;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1211
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1212 /* old style errors */
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1213 if (PyTuple_Check(err))
22721 253de588f2fb Get rid of another use of PyArg_Parse() Neal Norwitz <nnorwitz@gmail.com> parents: 22468 diff changeset	1214 return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1215 lineno, offset, text);
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1216
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1217 /* 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	1218
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1219 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	1220 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1221 *message = v;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1222
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1223 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	1224 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1225 if (v == Py_None)
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1226 *filename = NULL;
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1227 else if (! (*filename = _PyUnicode_AsString(v)))
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1228 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1229
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1230 Py_DECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1231 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	1232 goto finally;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44098 diff changeset	1233 hold = PyLong_AsLong(v);
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1234 Py_DECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1235 v = NULL;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1236 if (hold < 0 && PyErr_Occurred())
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1237 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1238 *lineno = (int)hold;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1239
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1240 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	1241 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	1242 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	1243 *offset = -1;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1244 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	1245 v = NULL;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1246 } else {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44098 diff changeset	1247 hold = PyLong_AsLong(v);
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1248 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	1249 v = NULL;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1250 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	1251 goto finally;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1252 *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	1253 }
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1254
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1255 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	1256 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1257 if (v == Py_None)
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1258 *text = NULL;
43525 b9d19d51de36 get rid of some more PyString uses. Guido van Rossum <guido@python.org> parents: 43225 diff changeset	1259 else if (!PyUnicode_Check(v) \|\|
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1260 !(*text = _PyUnicode_AsString(v)))
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1261 goto finally;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1262 Py_DECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1263 return 1;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1264
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1265 finally:
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1266 Py_XDECREF(v);
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1267 return 0;
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1268 }
7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1269
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1270 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1271 PyErr_Print(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1272 {
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1273 PyErr_PrintEx(1);
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1274 }
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1275
16831 27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1276 static void
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1277 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	1278 {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1279 char *nl;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1280 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	1281 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	1282 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1283 for (;;) {
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1284 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	1285 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	1286 break;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36078 diff changeset	1287 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	1288 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	1289 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1290 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	1291 text++;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1292 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1293 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1294 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1295 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	1296 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	1297 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	1298 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	1299 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	1300 return;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1301 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	1302 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1303 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	1304 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	1305 offset--;
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1306 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1307 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	1308 }
27f04d714ecb Print the offending line of code in the traceback for SyntaxErrors Jeremy Hylton <jeremy@alum.mit.edu> parents: 16648 diff changeset	1309
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	1310 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	1311 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	1312 {
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1313 PyObject exception, value, *tb;
01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1314 int exitcode = 0;
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1315
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1316 if (Py_InspectFlag)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1317 /* Don't exit if -i flag was given. This flag is set to 0
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1318 * when entering interactive mode for inspecting. */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1319 return;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1320
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	1321 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	1322 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	1323 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	1324 goto done;
36751 8e04de2480e4 PEP 352 implementation. Creates a new base class, BaseException, which has an Brett Cannon <bcannon@gmail.com> parents: 36726 diff changeset	1325 if (PyExceptionInstance_Check(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	1326 /* 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	1327 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	1328 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	1329 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	1330 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	1331 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	1332 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	1333 }
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1334 /* 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	1335 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	1336 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44098 diff changeset	1337 if (PyLong_Check(value))
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44098 diff changeset	1338 exitcode = (int)PyLong_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	1339 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	1340 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	1341 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	1342 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	1343 }
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1344 done:
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1345 /* Restore and clear the exception info, in order to properly decref
01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1346 * the exception, value, and traceback. If we just exit instead,
01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1347 * these leak, which confuses PYTHONDUMPREFS output, and may prevent
01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1348 * some finalizers from running.
01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1349 */
28698 aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1350 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	1351 PyErr_Clear();
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1352 Py_Exit(exitcode);
aef01a076ef9 handle_system_exit(): This leaked the current exception info, in Tim Peters <tim.peters@gmail.com> parents: 28694 diff changeset	1353 /* 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	1354 }
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1355
eb06a02e0507 Allow sys.excepthook and sys.exitfunc to quietly exit with a sys.exit(). Ka-Ping Yee <ping@zesty.ca> parents: 17168 diff changeset	1356 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1357 PyErr_PrintEx(int set_sys_last_vars)
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1358 {
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1359 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	1360
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	1361 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	1362 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	1363 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1364 PyErr_Fetch(&exception, &v, &tb);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1365 if (exception == NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1366 return;
6197 7da7ba5c6525 Added Py_UseClassExceptionsFlag, the variable containing the state of Barry Warsaw <barry@python.org> parents: 6165 diff changeset	1367 PyErr_NormalizeException(&exception, &v, &tb);
48874 4db1f5098175 #3663: extra DECREF on syntax errors. Antoine Pitrou <solipsis@pitrou.net> parents: 48839 diff changeset	1368 if (tb == NULL) {
4db1f5098175 #3663: extra DECREF on syntax errors. Antoine Pitrou <solipsis@pitrou.net> parents: 48839 diff changeset	1369 tb = Py_None;
4db1f5098175 #3663: extra DECREF on syntax errors. Antoine Pitrou <solipsis@pitrou.net> parents: 48839 diff changeset	1370 Py_INCREF(tb);
4db1f5098175 #3663: extra DECREF on syntax errors. Antoine Pitrou <solipsis@pitrou.net> parents: 48839 diff changeset	1371 }
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1372 PyException_SetTraceback(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	1373 if (exception == NULL)
5611 5ed3a21cc122 Can't return 0 from void function... Guido van Rossum <guido@python.org> parents: 5607 diff changeset	1374 return;
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	1375 /* Now we know v != NULL too */
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1376 if (set_sys_last_vars) {
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1377 PySys_SetObject("last_type", exception);
3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1378 PySys_SetObject("last_value", v);
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1379 PySys_SetObject("last_traceback", tb);
7206 3f255aedf621 Ehm, three unrelated changes. Guido van Rossum <guido@python.org> parents: 7113 diff changeset	1380 }
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1381 hook = PySys_GetObject("excepthook");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1382 if (hook) {
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1383 PyObject *args = PyTuple_Pack(3, exception, v, tb);
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1384 PyObject *result = PyEval_CallObject(hook, args);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1385 if (result == NULL) {
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1386 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	1387 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	1388 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	1389 }
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1390 PyErr_Fetch(&exception2, &v2, &tb2);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1391 PyErr_NormalizeException(&exception2, &v2, &tb2);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1392 /* It should not be possible for exception2 or v2
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1393 to be NULL. However PyErr_Display() can't
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1394 tolerate NULLs, so just be safe. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1395 if (exception2 == NULL) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1396 exception2 = Py_None;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1397 Py_INCREF(exception2);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1398 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1399 if (v2 == NULL) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1400 v2 = Py_None;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1401 Py_INCREF(v2);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1402 }
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1403 fflush(stdout);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1404 PySys_WriteStderr("Error in sys.excepthook:\n");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1405 PyErr_Display(exception2, v2, tb2);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1406 PySys_WriteStderr("\nOriginal exception was:\n");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1407 PyErr_Display(exception, v, tb);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1408 Py_DECREF(exception2);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1409 Py_DECREF(v2);
21284 43b8a962a32a Missing DECREFs when exception is raised in sys.excepthook. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21251 diff changeset	1410 Py_XDECREF(tb2);
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1411 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1412 Py_XDECREF(result);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1413 Py_XDECREF(args);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1414 } else {
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1415 PySys_WriteStderr("sys.excepthook is missing\n");
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1416 PyErr_Display(exception, v, tb);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1417 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1418 Py_XDECREF(exception);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1419 Py_XDECREF(v);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1420 Py_XDECREF(tb);
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1421 }
b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1422
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1423 static void
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1424 print_exception(PyObject f, PyObject value)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1425 {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1426 int err = 0;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1427 PyObject type, tb;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1428
48839 587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1429 if (!PyExceptionInstance_Check(value)) {
587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1430 PyFile_WriteString("TypeError: print_exception(): Exception expected for value, ", f);
587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1431 PyFile_WriteString(Py_TYPE(value)->tp_name, f);
587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1432 PyFile_WriteString(" found\n", f);
587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1433 return;
587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1434 }
587cd4f66c2d fix #3653 Python could segfault if invalid values were passed to sys.excepthook Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	1435
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1436 Py_INCREF(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1437 fflush(stdout);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1438 type = (PyObject *) Py_TYPE(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1439 tb = PyException_GetTraceback(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1440 if (tb && tb != Py_None)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1441 err = PyTraceBack_Print(tb, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1442 if (err == 0 &&
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1443 PyObject_HasAttrString(value, "print_file_and_line"))
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1444 {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1445 PyObject *message;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1446 const char filename, text;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1447 int lineno, offset;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1448 if (!parse_syntax_error(value, &message, &filename,
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1449 &lineno, &offset, &text))
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1450 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1451 else {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1452 char buf[10];
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1453 PyFile_WriteString(" File \"", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1454 if (filename == NULL)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1455 PyFile_WriteString("<string>", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1456 else
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1457 PyFile_WriteString(filename, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1458 PyFile_WriteString("\", line ", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1459 PyOS_snprintf(buf, sizeof(buf), "%d", lineno);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1460 PyFile_WriteString(buf, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1461 PyFile_WriteString("\n", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1462 if (text != NULL)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1463 print_error_text(f, offset, text);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1464 Py_DECREF(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1465 value = message;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1466 /* Can't be bothered to check all those
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1467 PyFile_WriteString() calls */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1468 if (PyErr_Occurred())
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1469 err = -1;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1470 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1471 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1472 if (err) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1473 /* Don't do anything else */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1474 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1475 else {
48477 e26c724d5e23 Make these files to compile again under Windows. Thomas Heller <theller@ctypes.org> parents: 48474 diff changeset	1476 PyObject* moduleName;
e26c724d5e23 Make these files to compile again under Windows. Thomas Heller <theller@ctypes.org> parents: 48474 diff changeset	1477 char* className;
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1478 assert(PyExceptionClass_Check(type));
48477 e26c724d5e23 Make these files to compile again under Windows. Thomas Heller <theller@ctypes.org> parents: 48474 diff changeset	1479 className = PyExceptionClass_Name(type);
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1480 if (className != NULL) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1481 char *dot = strrchr(className, '.');
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1482 if (dot != NULL)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1483 className = dot+1;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1484 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1485
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1486 moduleName = PyObject_GetAttrString(type, "__module__");
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1487 if (moduleName == NULL \|\| !PyUnicode_Check(moduleName))
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1488 {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1489 Py_DECREF(moduleName);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1490 err = PyFile_WriteString("<unknown>", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1491 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1492 else {
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1493 char* modstr = _PyUnicode_AsString(moduleName);
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1494 if (modstr && strcmp(modstr, "builtins"))
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1495 {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1496 err = PyFile_WriteString(modstr, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1497 err += PyFile_WriteString(".", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1498 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1499 Py_DECREF(moduleName);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1500 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1501 if (err == 0) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1502 if (className == NULL)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1503 err = PyFile_WriteString("<unknown>", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1504 else
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1505 err = PyFile_WriteString(className, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1506 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1507 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1508 if (err == 0 && (value != Py_None)) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1509 PyObject *s = PyObject_Str(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1510 /* only print colon if the str() of the
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1511 object is not the empty string
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1512 */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1513 if (s == NULL)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1514 err = -1;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1515 else if (!PyUnicode_Check(s) \|\|
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1516 PyUnicode_GetSize(s) != 0)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1517 err = PyFile_WriteString(": ", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1518 if (err == 0)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1519 err = PyFile_WriteObject(s, f, Py_PRINT_RAW);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1520 Py_XDECREF(s);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1521 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1522 /* try to write a newline in any case */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1523 err += PyFile_WriteString("\n", f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1524 Py_XDECREF(tb);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1525 Py_DECREF(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1526 /* If an error happened here, don't show it.
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1527 XXX This is wrong, but too many callers rely on this behavior. */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1528 if (err != 0)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1529 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1530 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1531
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1532 static const char *cause_message =
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1533 "\nThe above exception was the direct cause "
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1534 "of the following exception:\n\n";
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1535
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1536 static const char *context_message =
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1537 "\nDuring handling of the above exception, "
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1538 "another exception occurred:\n\n";
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1539
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1540 static void
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1541 print_exception_recursive(PyObject f, PyObject value, PyObject *seen)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1542 {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1543 int err = 0, res;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1544 PyObject cause, context;
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1545
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1546 if (seen != NULL) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1547 /* Exception chaining */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1548 if (PySet_Add(seen, value) == -1)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1549 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1550 else if (PyExceptionInstance_Check(value)) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1551 cause = PyException_GetCause(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1552 context = PyException_GetContext(value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1553 if (cause) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1554 res = PySet_Contains(seen, cause);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1555 if (res == -1)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1556 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1557 if (res == 0) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1558 print_exception_recursive(
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1559 f, cause, seen);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1560 err \|= PyFile_WriteString(
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1561 cause_message, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1562 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1563 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1564 if (context) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1565 res = PySet_Contains(seen, context);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1566 if (res == -1)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1567 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1568 if (res == 0) {
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1569 print_exception_recursive(
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1570 f, context, seen);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1571 err \|= PyFile_WriteString(
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1572 context_message, f);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1573 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1574 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1575 Py_XDECREF(context);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1576 Py_XDECREF(cause);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1577 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1578 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1579 print_exception(f, value);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1580 if (err != 0)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1581 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1582 }
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1583
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1584 void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	1585 PyErr_Display(PyObject exception, PyObject value, PyObject *tb)
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1586 {
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1587 PyObject *seen;
17164 b44e77a12978 Add sys.excepthook. Ka-Ping Yee <ping@zesty.ca> parents: 17125 diff changeset	1588 PyObject *f = PySys_GetObject("stderr");
43855 ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	1589 if (f == Py_None) {
ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	1590 /* pass */
ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	1591 }
ee081609cee8 Added some additional checks for sys.std?? is None, see #1440 Christian Heimes <christian@cheimes.de> parents: 43848 diff changeset	1592 else if (f == NULL) {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41587 diff changeset	1593 _PyObject_Dump(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	1594 fprintf(stderr, "lost sys.stderr\n");
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	1595 }
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	1596 else {
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1597 /* We choose to ignore seen being possibly NULL, and report
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1598 at least the main exception (it could be a MemoryError).
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1599 */
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1600 seen = PySet_New(NULL);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1601 if (seen == NULL)
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1602 PyErr_Clear();
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1603 print_exception_recursive(f, value, seen);
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47611 diff changeset	1604 Py_XDECREF(seen);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1605 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1606 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1607
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1608 PyObject *
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1609 PyRun_StringFlags(const char str, int start, PyObject globals,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1610 PyObject locals, PyCompilerFlags flags)
14228 20377f15b96a Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(), Guido van Rossum <guido@python.org> parents: 14227 diff changeset	1611 {
36835 9109b1a0d265 Get rid of run_err_mod(). It was only used in two places. Neal Norwitz <nnorwitz@gmail.com> parents: 36807 diff changeset	1612 PyObject *ret = NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1613 mod_ty mod;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1614 PyArena *arena = PyArena_New();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1615 if (arena == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1616 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	1617
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1618 mod = PyParser_ASTFromString(str, "<string>", start, flags, arena);
36835 9109b1a0d265 Get rid of run_err_mod(). It was only used in two places. Neal Norwitz <nnorwitz@gmail.com> parents: 36807 diff changeset	1619 if (mod != NULL)
9109b1a0d265 Get rid of run_err_mod(). It was only used in two places. Neal Norwitz <nnorwitz@gmail.com> parents: 36807 diff changeset	1620 ret = run_mod(mod, "<string>", globals, locals, flags, arena);
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1621 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1622 return ret;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1623 }
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1624
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1625 PyObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1626 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	1627 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	1628 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1629 PyObject *ret;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1630 mod_ty mod;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1631 PyArena *arena = PyArena_New();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1632 if (arena == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1633 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	1634
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1635 mod = PyParser_ASTFromFile(fp, filename, NULL, start, 0, 0,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1636 flags, NULL, arena);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1637 if (closeit)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41253 diff changeset	1638 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	1639 if (mod == NULL) {
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1640 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1641 return NULL;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1642 }
36835 9109b1a0d265 Get rid of run_err_mod(). It was only used in two places. Neal Norwitz <nnorwitz@gmail.com> parents: 36807 diff changeset	1643 ret = run_mod(mod, filename, globals, locals, flags, arena);
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1644 PyArena_Free(arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1645 return ret;
17125 2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1646 }
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1647
44162 ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1648 static void
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1649 flush_io(void)
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1650 {
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1651 PyObject f, r;
46299 e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1652 PyObject type, value, *traceback;
e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1653
e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1654 /* Save the current exception */
e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1655 PyErr_Fetch(&type, &value, &traceback);
e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1656
44162 ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1657 f = PySys_GetObject("stderr");
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1658 if (f != NULL) {
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1659 r = PyObject_CallMethod(f, "flush", "");
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1660 if (r)
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1661 Py_DECREF(r);
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1662 else
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1663 PyErr_Clear();
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1664 }
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1665 f = PySys_GetObject("stdout");
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1666 if (f != NULL) {
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1667 r = PyObject_CallMethod(f, "flush", "");
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1668 if (r)
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1669 Py_DECREF(r);
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1670 else
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1671 PyErr_Clear();
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1672 }
46299 e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1673
e8916c64df4c Issue2221: in Idle, exec('xx') raised a SystemError('error return without exception set') Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46126 diff changeset	1674 PyErr_Restore(type, value, traceback);
44162 ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1675 }
ef5399b353c9 Solve issue 1400 at least in part -- whenever we run Python code, at the end Guido van Rossum <guido@python.org> parents: 44134 diff changeset	1676
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1677 static PyObject *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1678 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	1679 PyCompilerFlags flags, PyArena arena)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1680 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1681 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	1682 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	1683 co = PyAST_Compile(mod, filename, flags, arena);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1684 if (co == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1685 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	1686 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	1687 Py_DECREF(co);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1688 return v;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1689 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1690
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1691 static PyObject *
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1692 run_pyc_file(FILE fp, const char filename, PyObject *globals,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1693 PyObject locals, PyCompilerFlags flags)
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1694 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1695 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	1696 PyObject *v;
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1697 long magic;
14278 fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	1698 long PyImport_GetMagicNumber(void);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1699
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1700 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	1701 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	1702 PyErr_SetString(PyExc_RuntimeError,
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1703 "Bad magic number in .pyc file");
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1704 return NULL;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1705 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1706 (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	1707 v = PyMarshal_ReadLastObjectFromFile(fp);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1708 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	1709 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	1710 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	1711 PyErr_SetString(PyExc_RuntimeError,
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1712 "Bad code object in .pyc file");
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1713 return NULL;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1714 }
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1715 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	1716 v = PyEval_EvalCode(co, globals, locals);
19158 97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19099 diff changeset	1717 if (v && flags)
97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19099 diff changeset	1718 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	1719 Py_DECREF(co);
1886 ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1720 return v;
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1721 }
ac6a9f90f6fd * Import/pythonrun.h, Python/{import,pythonrun}.c, Guido van Rossum <guido@python.org> parents: 1870 diff changeset	1722
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1723 PyObject *
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	1724 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	1725 PyCompilerFlags *flags)
2054cea38754 Extend support for from __future__ import nested_scopes Jeremy Hylton <jeremy@alum.mit.edu> parents: 16916 diff changeset	1726 {
5170 f5d707ce4223 Greatly renamed. Not a very thorough job -- I'm going to restructure Guido van Rossum <guido@python.org> parents: 5108 diff changeset	1727 PyCodeObject *co;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1728 mod_ty mod;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1729 PyArena *arena = PyArena_New();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1730 if (arena == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1731 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1732
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1733 mod = PyParser_ASTFromString(str, filename, start, flags, arena);
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	1734 if (mod == NULL) {
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1735 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	1736 return NULL;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1737 }
36662 2ab9270ef19a Check whether there are flags. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	1738 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	1739 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	1740 PyArena_Free(arena);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1741 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1742 }
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	1743 co = PyAST_Compile(mod, filename, flags, arena);
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1744 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	1745 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	1746 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access Guido van Rossum <guido@python.org> parents: 1262 diff changeset	1747
16421 aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1748 struct symtable *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1749 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	1750 {
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1751 struct symtable *st;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1752 mod_ty mod;
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1753 PyCompilerFlags flags;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1754 PyArena *arena = PyArena_New();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1755 if (arena == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1756 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1757
46125 36d828d27c36 Merged revisions 61954,61956-61957 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46120 diff changeset	1758 flags.cf_flags = 0;
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1759 mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
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	1760 if (mod == NULL) {
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1761 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	1762 return NULL;
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1763 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1764 st = PySymtable_Build(mod, filename, 0);
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1765 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	1766 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	1767 }
aa844711463a Move a bunch of definitions that were internal to compile.c to Jeremy Hylton <jeremy@alum.mit.edu> parents: 16311 diff changeset	1768
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1769 /* Preferred access to parser is through AST. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1770 mod_ty
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1771 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	1772 PyCompilerFlags flags, PyArena arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1773 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1774 mod_ty mod;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1775 PyCompilerFlags localflags;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1776 perrdetail err;
46126 b06a15efdc6d Merged revisions 61958-61959 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46125 diff changeset	1777 int iflags = PARSER_FLAGS(flags);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1778
78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1779 node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1780 &_PyParser_Grammar, start, &err,
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1781 &iflags);
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1782 if (flags == NULL) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1783 localflags.cf_flags = 0;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1784 flags = &localflags;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1785 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1786 if (n) {
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1787 flags->cf_flags \|= iflags & PyCF_MASK;
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	1788 mod = PyAST_FromNode(n, flags, filename, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1789 PyNode_Free(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1790 return mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1791 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1792 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1793 err_input(&err);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1794 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1795 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1796 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1797
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1798 mod_ty
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1799 PyParser_ASTFromFile(FILE fp, const char filename, const char* enc,
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1800 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	1801 char ps2, PyCompilerFlags flags, int *errcode,
36836 01bc8ee3d2ff Tabify Neal Norwitz <nnorwitz@gmail.com> parents: 36835 diff changeset	1802 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1803 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1804 mod_ty mod;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1805 PyCompilerFlags localflags;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1806 perrdetail err;
46126 b06a15efdc6d Merged revisions 61958-61959 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46125 diff changeset	1807 int iflags = PARSER_FLAGS(flags);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1808
78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1809 node *n = PyParser_ParseFileFlagsEx(fp, filename, enc,
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1810 &_PyParser_Grammar,
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45914 diff changeset	1811 start, ps1, ps2, &err, &iflags);
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1812 if (flags == NULL) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1813 localflags.cf_flags = 0;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1814 flags = &localflags;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1815 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1816 if (n) {
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49613 diff changeset	1817 flags->cf_flags \|= iflags & PyCF_MASK;
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	1818 mod = PyAST_FromNode(n, flags, filename, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1819 PyNode_Free(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1820 return mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1821 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1822 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1823 err_input(&err);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1824 if (errcode)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1825 *errcode = err.error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1826 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1827 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1828 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1829
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1830 /* 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	1831
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1832 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1833 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	1834 {
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1835 perrdetail err;
43225 38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1836 node *n = PyParser_ParseFileFlags(fp, filename, NULL,
38f3f9ef193d Convert code from sys.stdin.encoding to UTF-8 in Martin v. Löwis <martin@v.loewis.de> parents: 43147 diff changeset	1837 &_PyParser_Grammar,
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	1838 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	1839 if (n == NULL)
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1840 err_input(&err);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1841
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1842 return n;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1843 }
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1844
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1845 /* 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	1846
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1847 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1848 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	1849 {
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1850 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	1851 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	1852 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	1853 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	1854 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	1855 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	1856 }
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1857
0a90e5ec61b6 Ugly. A pile of new xxxFlags() functions, to communicate to the parser Tim Peters <tim.peters@gmail.com> parents: 18612 diff changeset	1858 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1859 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	1860 int start, int flags)
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1861 {
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1862 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	1863 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	1864 &_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	1865 if (n == NULL)
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1866 err_input(&err);
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1867 return n;
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1868 }
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1869
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1870 node *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	1871 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	1872 {
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	1873 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	1874 }
cb728141ae12 Fix SF Bug 564931: compile() traceback must include filename. Thomas Heller <theller@ctypes.org> parents: 24155 diff changeset	1875
28649 04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1876 /* 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	1877 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	1878
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1879 void
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1880 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	1881 {
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1882 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	1883 }
04b172843292 A missing piece of the PEP 269 patch: add PyParser_SetError(), a Guido van Rossum <guido@python.org> parents: 28648 diff changeset	1884
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1885 /* 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	1886
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1887 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1888 err_input(perrdetail *err)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1889 {
43147 06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1890 PyObject v, w, errtype, errtext;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1891 PyObject* u = NULL;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1892 char *msg = NULL;
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1893 errtype = PyExc_SyntaxError;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1894 switch (err->error) {
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1895 case E_SYNTAX:
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1896 errtype = PyExc_IndentationError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1897 if (err->expected == INDENT)
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1898 msg = "expected an indented block";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1899 else if (err->token == INDENT)
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1900 msg = "unexpected indent";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1901 else if (err->token == DEDENT)
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1902 msg = "unexpected unindent";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1903 else {
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1904 errtype = PyExc_SyntaxError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1905 msg = "invalid syntax";
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1906 }
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1907 break;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1908 case E_TOKEN:
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1909 msg = "invalid token";
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1910 break;
24839 17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1911 case E_EOFS:
47072 0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46708 diff changeset	1912 msg = "EOF while scanning triple-quoted string literal";
24839 17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1913 break;
17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1914 case E_EOLS:
47072 0c7142c56d7e Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 46708 diff changeset	1915 msg = "EOL while scanning string literal";
24839 17e95cc06f69 provide less mysterious error messages when seeing end-of-line in Skip Montanaro <skip@pobox.com> parents: 24539 diff changeset	1916 break;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1917 case E_INTR:
32526 78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 31797 diff changeset	1918 if (!PyErr_Occurred())
78bd25b42d46 This closes patch: Michael W. Hudson <mwh@python.net> parents: 31797 diff changeset	1919 PyErr_SetNone(PyExc_KeyboardInterrupt);
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1920 goto cleanup;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1921 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	1922 PyErr_NoMemory();
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1923 goto cleanup;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1924 case E_EOF:
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1925 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	1926 break;
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1927 case E_TABSPACE:
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1928 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	1929 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	1930 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	1931 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	1932 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	1933 break;
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1934 case E_DEDENT:
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1935 errtype = PyExc_IndentationError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1936 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	1937 break;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1938 case E_TOODEEP:
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1939 errtype = PyExc_IndentationError;
feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1940 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	1941 break;
35417 e48fcd4c358d Forward UnicodeDecodeError into SyntaxError for source encoding errors. Martin v. Löwis <martin@v.loewis.de> parents: 35297 diff changeset	1942 case E_DECODE: {
e48fcd4c358d Forward UnicodeDecodeError into SyntaxError for source encoding errors. Martin v. Löwis <martin@v.loewis.de> parents: 35297 diff changeset	1943 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	1944 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	1945 if (value != NULL) {
43866 8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the Thomas Heller <theller@ctypes.org> parents: 43855 diff changeset	1946 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	1947 if (u != NULL) {
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48563 diff changeset	1948 msg = _PyUnicode_AsString(u);
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1949 }
06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1950 }
32781 caaef302f1e3 Patch #984714: Properly diagnose E_DECODE errors. Martin v. Löwis <martin@v.loewis.de> parents: 32526 diff changeset	1951 if (msg == NULL)
caaef302f1e3 Patch #984714: Properly diagnose E_DECODE errors. Martin v. Löwis <martin@v.loewis.de> parents: 32526 diff changeset	1952 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	1953 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	1954 Py_XDECREF(value);
35666 b8e571e6de2e - Fix segfault with invalid coding. Neal Norwitz <nnorwitz@gmail.com> parents: 35417 diff changeset	1955 Py_XDECREF(tb);
32781 caaef302f1e3 Patch #984714: Properly diagnose E_DECODE errors. Martin v. Löwis <martin@v.loewis.de> parents: 32526 diff changeset	1956 break;
24539 06f1e2fd05bc Patch #534304: Implement phase 1 of PEP 263. Martin v. Löwis <martin@v.loewis.de> parents: 24162 diff changeset	1957 }
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	1958 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	1959 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	1960 break;
42597 20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42539 diff changeset	1961
20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42539 diff changeset	1962 case E_IDENTIFIER:
20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42539 diff changeset	1963 msg = "invalid character in identifier";
20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42539 diff changeset	1964 break;
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1965 default:
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1966 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	1967 msg = "unknown parsing error";
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1968 break;
1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1969 }
43147 06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1970 /* err->text may not be UTF-8 in case of decoding errors.
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1971 Explicitly convert to an object. */
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1972 if (!err->text) {
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1973 errtext = Py_None;
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1974 Py_INCREF(Py_None);
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1975 } else {
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1976 errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text),
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1977 "replace");
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1978 }
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1979 v = Py_BuildValue("(ziiN)", err->filename,
06dc4321a56a Explicitly convert err->text to Unicode. Fixes #1069. Martin v. Löwis <martin@v.loewis.de> parents: 42893 diff changeset	1980 err->lineno, err->offset, errtext);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1981 w = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1982 if (v != NULL)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	1983 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	1984 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	1985 Py_XDECREF(v);
13539 feab677269e0 Create two new exceptions: IndentationError and TabError. These are Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1986 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	1987 Py_XDECREF(w);
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1988 cleanup:
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1989 if (err->text != NULL) {
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1990 PyObject_FREE(err->text);
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1991 err->text = NULL;
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48494 diff changeset	1992 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1993 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1994
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1995 /* Print fatal error message and abort */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1996
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1997 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	1998 Py_FatalError(const char *msg)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1999 {
1911 a7f269610ec2 * Python/pythonrun.c: add string "Python" to fatal error message Guido van Rossum <guido@python.org> parents: 1898 diff changeset	2000 fprintf(stderr, "Fatal Python error: %s\n", msg);
52612 fa3b2ed20d85 Merged revisions 70913 via svnmerge from Jesse Noller <jnoller@gmail.com> parents: 51082 diff changeset	2001 fflush(stderr); /* it helps in Windows debug build */
43605 a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	2002 if (PyErr_Occurred()) {
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	2003 PyErr_Print();
a2bb76d11d66 Patch 1267 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43569 diff changeset	2004 }
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23252 diff changeset	2005 #ifdef MS_WINDOWS
50558 fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2006 {
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2007 size_t len = strlen(msg);
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2008 WCHAR* buffer;
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2009 size_t i;
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2010
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2011 /* Convert the message to wchar_t. This uses a simple one-to-one
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2012 conversion, assuming that the this error message actually uses ASCII
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2013 only. If this ceases to be true, we will have to convert. */
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2014 buffer = alloca( (len+1) * (sizeof *buffer));
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2015 for( i=0; i<=len; ++i)
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2016 buffer[i] = msg[i];
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2017 OutputDebugStringW(L"Fatal Python error: ");
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2018 OutputDebugStringW(buffer);
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2019 OutputDebugStringW(L"\n");
fbf7f53f4888 Merged revisions 68175 via svnmerge from Georg Brandl <georg@python.org> parents: 49819 diff changeset	2020 }
8988 070de4d39ddd Add DebugBreak() call to Py_FatalError() for Mark Hammond (only on Guido van Rossum <guido@python.org> parents: 7967 diff changeset	2021 #ifdef _DEBUG
070de4d39ddd Add DebugBreak() call to Py_FatalError() for Mark Hammond (only on Guido van Rossum <guido@python.org> parents: 7967 diff changeset	2022 DebugBreak();
2529 16ea57c38c4f In NT, write fatal() msg to debugging device Guido van Rossum <guido@python.org> parents: 2318 diff changeset	2023 #endif
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23252 diff changeset	2024 #endif /* MS_WINDOWS */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2025 abort();
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2026 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2027
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2028 /* Clean up and exit */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2029
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2030 #ifdef WITH_THREAD
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9192 diff changeset	2031 #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	2032 #endif
a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 941 diff changeset	2033
41253 f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2034 static void (*pyexitfunc)(void) = NULL;
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2035 /* For the atexit module. */
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2036 void _Py_PyAtExit(void (*func)(void))
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2037 {
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2038 pyexitfunc = func;
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2039 }
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2040
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2041 static void
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2042 call_py_exitfuncs(void)
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2043 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43718 diff changeset	2044 if (pyexitfunc == NULL)
41253 f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2045 return;
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2046
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2047 (*pyexitfunc)();
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2048 PyErr_Clear();
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2049 }
f29f1a8b7869 Patch #1680961: remove sys.exitfunc and replace it with a private C API. Also, reimplement atexit in C so it can take advantage of this private API. Collin Winter <collinw@gmail.com> parents: 40978 diff changeset	2050
9192 ac6c29d1f10c On second though, NEXITFUNCS should be defined here and not in Guido van Rossum <guido@python.org> parents: 9161 diff changeset	2051 #define NEXITFUNCS 32
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2052 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	2053 static int nexitfuncs = 0;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2054
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2055 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	2056 {
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2057 if (nexitfuncs >= NEXITFUNCS)
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2058 return -1;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2059 exitfuncs[nexitfuncs++] = func;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2060 return 0;
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2061 }
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2062
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	2063 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2064 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	2065 {
1870 61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2066 while (nexitfuncs > 0)
61738ed6cc10 added Py_AtExit() -- register cleanup functions for C modules Guido van Rossum <guido@python.org> parents: 1839 diff changeset	2067 (*exitfuncs[--nexitfuncs])();
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	2068
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	2069 fflush(stdout);
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5850 diff changeset	2070 fflush(stderr);
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	2071 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	2072
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	2073 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2074 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	2075 {
5939 2c65bb6ab87c Merge Py_Cleanup() into Py_Finalize(). Call the various small Fini() Guido van Rossum <guido@python.org> parents: 5926 diff changeset	2076 Py_Finalize();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2077
3235 3df9ab03badf Moved mac-specific exit handling to macmain.c Jack Jansen <jack.jansen@cwi.nl> parents: 3152 diff changeset	2078 exit(sts);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2079 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2080
1319 cd397266dc1c * Makefile: added all: and default: targets. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	2081 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	2082 initsigs(void)
1079 e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	2083 {
1839 1f4a86dbcd79 * Python/pythonrun.c (print_error): added INCREF/DECREF pair -- Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2084 #ifdef SIGPIPE
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2085 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	2086 #endif
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	2087 #ifdef SIGXFZ
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2088 PyOS_setsig(SIGXFZ, SIG_IGN);
19295 157bbb896198 Bunchathings: Guido van Rossum <guido@python.org> parents: 19237 diff changeset	2089 #endif
23252 4f335ca3f11c Ignore SIGXFSZ. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23020 diff changeset	2090 #ifdef SIGXFSZ
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2091 PyOS_setsig(SIGXFSZ, SIG_IGN);
23252 4f335ca3f11c Ignore SIGXFSZ. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23020 diff changeset	2092 #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	2093 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	2094 }
e4c6a0dd5c2b * bltinmodule.c: added built-in function cmp(a, b) Guido van Rossum <guido@python.org> parents: 1073 diff changeset	2095
5108 a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2096
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2097 /*
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2098 * 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	2099 * 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	2100 * 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	2101 * 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	2102 */
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2103 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 26263 diff changeset	2104 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	2105 {
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2106 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	2107 return 1;
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2108 if (!Py_InteractiveFlag)
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2109 return 0;
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2110 return (filename == NULL) \|\|
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2111 (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	2112 (strcmp(filename, "???") == 0);
a9a6d416b945 Added new global flag variable Py_InteractiveFlag and new function Guido van Rossum <guido@python.org> parents: 4596 diff changeset	2113 }
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2114
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2115
28648 0e8416be208e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 28647 diff changeset	2116 #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	2117 #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	2118
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2119 /* 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	2120
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2121 #include <malloc.h>
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2122 #include <excpt.h>
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2123
14278 fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	2124 /*
fb8fb53a2eff Add a comment explaining the return value of PyOS_CheckStack(). Fred Drake <fdrake@acm.org> parents: 14231 diff changeset	2125 * 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	2126 */
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2127 int
14280 68b61aa1aa4a PyOS_CheckStack(): Better ANSI'fy this while we're at it. Fred Drake <fdrake@acm.org> parents: 14278 diff changeset	2128 PyOS_CheckStack(void)
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2129 {
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2130 __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	2131 /* 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	2132 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	2133 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	2134 return 0;
45399 15d5776f2703 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60878,60880-60892,60894-60898 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45244 diff changeset	2135 } __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
45914 4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	2136 EXCEPTION_EXECUTE_HANDLER :
4284718fb631 Issue2297: Fix a stack overflow in Windows caused by -v and -vv. When python is invoked with -v or -vv under Windows, the process of importing the codec for sys.stderr causes a message to be written to stderr, which in turn causes the codec to be recursively imported. Sometimes the stack overflow exception is swallowed, other times it is not. The bug depends on the particular locale settings of the Windows machine. Trent Nelson <trent.nelson@snakebite.org> parents: 45399 diff changeset	2137 EXCEPTION_CONTINUE_SEARCH) {
45399 15d5776f2703 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60878,60880-60892,60894-60898 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45244 diff changeset	2138 int errcode = _resetstkoflw();
49819 630c174b465e Merged revisions 67295,67301-67302,67318,67330,67342-67343 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49624 diff changeset	2139 if (errcode == 0)
45399 15d5776f2703 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60878,60880-60892,60894-60898 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45244 diff changeset	2140 {
15d5776f2703 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60878,60880-60892,60894-60898 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45244 diff changeset	2141 Py_FatalError("Could not reset the stack!");
15d5776f2703 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60878,60880-60892,60894-60898 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45244 diff changeset	2142 }
14227 9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2143 }
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2144 return 1;
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2145 }
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2146
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2147 #endif /* WIN32 && _MSC_VER */
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2148
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2149 /* 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	2150
9f9f3280dc68 implements PyOS_CheckStack for Windows and MSVC. this fixes a Fredrik Lundh <fredrik@pythonware.com> parents: 14195 diff changeset	2151 #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	2152
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2153
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2154 /* 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	2155
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2156 PyOS_sighandler_t
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2157 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	2158 {
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2159 #ifdef HAVE_SIGACTION
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2160 struct sigaction context;
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2161 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	2162 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	2163 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	2164 #else
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2165 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	2166 /* 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	2167 #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	2168 switch (sig) {
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2169 /* 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	2170 case SIGINT:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2171 case SIGILL:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2172 case SIGFPE:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2173 case SIGSEGV:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2174 case SIGTERM:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2175 case SIGBREAK:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2176 case SIGABRT:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2177 break;
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2178 /* 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	2179 default:
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2180 return SIG_ERR;
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2181 }
72555a967d6a Patch #1350409: Port signal handling to VS 2005. Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	2182 #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	2183 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	2184 if (handler != SIG_ERR)
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2185 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	2186 return handler;
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2187 #endif
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2188 }
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2189
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2190 PyOS_sighandler_t
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2191 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	2192 {
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2193 #ifdef HAVE_SIGACTION
33747 b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2194 struct sigaction context, ocontext;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2195 context.sa_handler = handler;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2196 sigemptyset(&context.sa_mask);
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2197 context.sa_flags = 0;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2198 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	2199 return SIG_ERR;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2200 return ocontext.sa_handler;
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2201 #else
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2202 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	2203 oldhandler = signal(sig, handler);
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2204 #ifdef HAVE_SIGINTERRUPT
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2205 siginterrupt(sig, 1);
b0ec4c9d595b Patch #975056 - fixes for restartable signals on BSD. In addition, Anthony Baxter <anthonybaxter@gmail.com>* parents: 33715 diff changeset	2206 #endif
14637 37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2207 return oldhandler;
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2208 #endif
37397bd1f8a8 Add PyOS_getsig() and PyOS_setsig() -- wrappers around signal() or Guido van Rossum <guido@python.org> parents: 14375 diff changeset	2209 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2210
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2211 /* 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	2212
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2213 #undef PyParser_SimpleParseFile
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2214 PyAPI_FUNC(node *)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2215 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	2216 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2217 return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2218 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2219
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2220 #undef PyParser_SimpleParseString
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2221 PyAPI_FUNC(node *)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2222 PyParser_SimpleParseString(const char *str, int start)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2223 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2224 return PyParser_SimpleParseStringFlags(str, start, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35666 diff changeset	2225 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2226
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2227 #undef PyRun_AnyFile
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2228 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2229 PyRun_AnyFile(FILE fp, const char name)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2230 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2231 return PyRun_AnyFileExFlags(fp, name, 0, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2232 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2233
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2234 #undef PyRun_AnyFileEx
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2235 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2236 PyRun_AnyFileEx(FILE fp, const char name, int closeit)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2237 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2238 return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2239 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2240
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2241 #undef PyRun_AnyFileFlags
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2242 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2243 PyRun_AnyFileFlags(FILE fp, const char name, PyCompilerFlags *flags)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2244 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2245 return PyRun_AnyFileExFlags(fp, name, 0, flags);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2246 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2247
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2248 #undef PyRun_File
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2249 PyAPI_FUNC(PyObject *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2250 PyRun_File(FILE fp, const char p, int s, PyObject g, PyObject l)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2251 {
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	2252 return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2253 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2254
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2255 #undef PyRun_FileEx
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2256 PyAPI_FUNC(PyObject *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2257 PyRun_FileEx(FILE fp, const char p, int s, PyObject g, PyObject l, int c)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2258 {
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	2259 return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2260 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2261
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2262 #undef PyRun_FileFlags
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2263 PyAPI_FUNC(PyObject *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2264 PyRun_FileFlags(FILE fp, const char p, int s, PyObject g, PyObject l,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2265 PyCompilerFlags *flags)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2266 {
48494 aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from Georg Brandl <georg@python.org> parents: 48477 diff changeset	2267 return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2268 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2269
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2270 #undef PyRun_SimpleFile
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2271 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2272 PyRun_SimpleFile(FILE f, const char p)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2273 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2274 return PyRun_SimpleFileExFlags(f, p, 0, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2275 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2276
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2277 #undef PyRun_SimpleFileEx
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2278 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2279 PyRun_SimpleFileEx(FILE f, const char p, int c)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2280 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2281 return PyRun_SimpleFileExFlags(f, p, c, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2282 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2283
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2284
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2285 #undef PyRun_String
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2286 PyAPI_FUNC(PyObject *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2287 PyRun_String(const char str, int s, PyObject g, PyObject *l)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2288 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2289 return PyRun_StringFlags(str, s, g, l, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2290 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2291
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2292 #undef PyRun_SimpleString
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2293 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2294 PyRun_SimpleString(const char *s)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2295 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2296 return PyRun_SimpleStringFlags(s, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2297 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2298
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2299 #undef Py_CompileString
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2300 PyAPI_FUNC(PyObject *)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2301 Py_CompileString(const char str, const char p, int s)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2302 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2303 return Py_CompileStringFlags(str, p, s, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2304 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2305
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2306 #undef PyRun_InteractiveOne
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2307 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2308 PyRun_InteractiveOne(FILE f, const char p)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2309 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2310 return PyRun_InteractiveOneFlags(f, p, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2311 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2312
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2313 #undef PyRun_InteractiveLoop
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2314 PyAPI_FUNC(int)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2315 PyRun_InteractiveLoop(FILE f, const char p)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2316 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2317 return PyRun_InteractiveLoopFlags(f, p, NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2318 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2319
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2320 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2321 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37056 diff changeset	2322 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/pythonrun.c @ 68249:4cd9f5e89061 3.0