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

annotate Python/pythonrun.c @ 40582:67287ca4e1e8

Merged revisions 53005-53303 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r53012 | walter.doerwald | 2006-12-12 22:55:31 +0100 (Tue, 12 Dec 2006) | 2 lines Fix typo. ........ r53023 | brett.cannon | 2006-12-13 23:31:37 +0100 (Wed, 13 Dec 2006) | 2 lines Remove an unneeded import of 'warnings'. ........ r53025 | brett.cannon | 2006-12-14 00:02:38 +0100 (Thu, 14 Dec 2006) | 2 lines Remove unneeded imports of 'warnings'. ........ r53026 | brett.cannon | 2006-12-14 00:09:53 +0100 (Thu, 14 Dec 2006) | 4 lines Add test.test_support.guard_warnings_filter . This function returns a context manager that protects warnings.filter from being modified once the context is exited. ........ r53029 | george.yoshida | 2006-12-14 03:22:44 +0100 (Thu, 14 Dec 2006) | 2 lines Note that guard_warnings_filter was added in 2.6 ........ r53031 | vinay.sajip | 2006-12-14 09:53:55 +0100 (Thu, 14 Dec 2006) | 1 line Added news on recent changes to logging ........ r53032 | andrew.kuchling | 2006-12-14 19:57:53 +0100 (Thu, 14 Dec 2006) | 1 line [Patch #1599256 from David Watson] check that os.fsync is available before using it ........ r53042 | kurt.kaiser | 2006-12-15 06:13:11 +0100 (Fri, 15 Dec 2006) | 6 lines 1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112. 2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt M AutoCompleteWindow.py M NEWS.txt ........ r53048 | andrew.kuchling | 2006-12-18 18:12:31 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1618083] Add missing word; make a few grammar fixes ........ r53050 | andrew.kuchling | 2006-12-18 18:16:05 +0100 (Mon, 18 Dec 2006) | 1 line Bump version ........ r53051 | andrew.kuchling | 2006-12-18 18:22:07 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1616726] Fix description of generator.close(); if you raise some random exception, the exception is raised and doesn't trigger a RuntimeError ........ r53052 | andrew.kuchling | 2006-12-18 18:38:14 +0100 (Mon, 18 Dec 2006) | 1 line Describe new methods in Queue module ........ r53053 | andrew.kuchling | 2006-12-18 20:22:24 +0100 (Mon, 18 Dec 2006) | 1 line [Patch #1615868 by Lars Gustaebel] Use Py_off_t to fix BZ2File.seek() for offsets > 2Gb ........ r53057 | andrew.kuchling | 2006-12-18 22:29:07 +0100 (Mon, 18 Dec 2006) | 1 line Fix markup ........ r53063 | thomas.wouters | 2006-12-19 09:17:50 +0100 (Tue, 19 Dec 2006) | 5 lines Make sre's SubPattern objects accept slice objects like it already accepts simple slices. ........ r53065 | andrew.kuchling | 2006-12-19 15:13:05 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1618455 by Ben Maurer] Improve speed of HMAC by using str.translate() instead of a more general XOR that has to construct a list. Slightly modified from Maurer's patch: the _strxor() function is no longer necessary at all. ........ r53066 | andrew.kuchling | 2006-12-19 15:28:23 +0100 (Tue, 19 Dec 2006) | 9 lines [Bug #1613651] Document socket.recv_into, socket.recvfrom_into Also, the text for recvfrom told you to read recv() for an explanation of the 'flags' argument, but recv() just pointed you at the man page. Copied the man-page text to recvfrom(), recvfrom_into, recv_into to avoid the pointless redirection. I don't have LaTeX on this machine; hope my markup is OK. ........ r53067 | andrew.kuchling | 2006-12-19 15:29:04 +0100 (Tue, 19 Dec 2006) | 1 line Comment typo ........ r53068 | andrew.kuchling | 2006-12-19 16:11:41 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1617413 from Dug Song] Fix HTTP Basic authentication via HTTPS ........ r53071 | andrew.kuchling | 2006-12-19 16:18:12 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1600491 from Jim Jewett] Describe how to build help files on Windows ........ r53073 | andrew.kuchling | 2006-12-19 16:43:10 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1587139 by kxroberto] Protect lock acquisition/release with try...finally to ensure the lock is always released. This could use the 'with' statement, but the patch uses 'finally'. 2.5 backport candidate. ........ r53074 | vinay.sajip | 2006-12-19 19:29:11 +0100 (Tue, 19 Dec 2006) | 1 line Updated documentation for findCaller() to indicate that a 3-tuple is now returned, rather than a 2-tuple. ........ r53090 | georg.brandl | 2006-12-19 23:06:46 +0100 (Tue, 19 Dec 2006) | 3 lines Patch #1484695: The tarfile module now raises a HeaderError exception if a buffer given to frombuf() is invalid. ........ r53099 | raymond.hettinger | 2006-12-20 07:42:06 +0100 (Wed, 20 Dec 2006) | 5 lines Bug #1590891: random.randrange don't return correct value for big number Needs to be backported. ........ r53106 | georg.brandl | 2006-12-20 12:55:16 +0100 (Wed, 20 Dec 2006) | 3 lines Testcase for patch #1484695. ........ r53110 | andrew.kuchling | 2006-12-20 20:48:20 +0100 (Wed, 20 Dec 2006) | 17 lines [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. ........ r53112 | andrew.kuchling | 2006-12-20 20:57:10 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619674] Make sum() use the term iterable, not sequence ........ r53113 | andrew.kuchling | 2006-12-20 20:58:11 +0100 (Wed, 20 Dec 2006) | 1 line Two grammar fixes ........ r53115 | andrew.kuchling | 2006-12-20 21:11:12 +0100 (Wed, 20 Dec 2006) | 5 lines Some other built-in functions are described with 'sequence' arguments that should really be 'iterable'; this commit changes them. Did I miss any? Did I introduce any errors? ........ r53117 | andrew.kuchling | 2006-12-20 21:20:42 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619680] in_dll() arguments are documented in the wrong order ........ r53120 | neal.norwitz | 2006-12-21 05:38:00 +0100 (Thu, 21 Dec 2006) | 1 line Lars asked for permission on on python-dev for work on tarfile.py ........ r53125 | andrew.kuchling | 2006-12-21 14:40:29 +0100 (Thu, 21 Dec 2006) | 1 line Mention the os.SEEK_* constants ........ r53129 | walter.doerwald | 2006-12-21 19:06:30 +0100 (Thu, 21 Dec 2006) | 2 lines Fix typo. ........ r53131 | thomas.heller | 2006-12-21 19:30:56 +0100 (Thu, 21 Dec 2006) | 3 lines Fix wrong markup of an argument in a method signature. Will backport. ........ r53137 | andrew.kuchling | 2006-12-22 01:50:56 +0100 (Fri, 22 Dec 2006) | 1 line Typo fix ........ r53139 | andrew.kuchling | 2006-12-22 14:25:02 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories ........ r53141 | andrew.kuchling | 2006-12-22 16:04:45 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128] Make the mode argument of dumbdbm actually work the way it's described, and add a test for it. 2.5 bugfix candidate, maybe; arguably this patch changes the API of dumbdbm and shouldn't be added in a point-release. ........ r53142 | andrew.kuchling | 2006-12-22 16:16:58 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128 continued] Modify mode depending on the process umask. Is there really no other way to read the umask than to set it? Hope this works on Windows... ........ r53145 | andrew.kuchling | 2006-12-22 17:43:26 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #776202] Apply Walter Doerwald's patch to use text mode for encoded files ........ r53146 | andrew.kuchling | 2006-12-22 19:41:42 +0100 (Fri, 22 Dec 2006) | 9 lines [Patch #783050 from Patrick Lynch] The emulation of forkpty() is incorrect; the master should close the slave fd. Added a test to test_pty.py that reads from the master_fd after doing a pty.fork(); without the fix it hangs forever instead of raising an exception. (<crossing fingers for the buildbots>) 2.5 backport candidate. ........ r53147 | andrew.kuchling | 2006-12-22 20:06:16 +0100 (Fri, 22 Dec 2006) | 1 line [Patch #827559 from Chris Gonnerman] Make SimpleHTTPServer redirect when a directory URL is missing the trailing slash; this lets relative links work. ........ r53149 | andrew.kuchling | 2006-12-22 20:21:27 +0100 (Fri, 22 Dec 2006) | 1 line Darn; this test works when you run test_pty.py directly, but fails when regrtest runs it (the os.read() raises os.error). I can't figure out the cause, so am commenting out the test. ........ r53150 | andrew.kuchling | 2006-12-22 22:48:19 +0100 (Fri, 22 Dec 2006) | 1 line Frak; this test also fails ........ r53153 | lars.gustaebel | 2006-12-23 17:40:13 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1230446: tarfile.py: fix ExFileObject so that read() and tell() work correctly together with readline(). Will backport to 2.5. ........ r53155 | lars.gustaebel | 2006-12-23 18:57:23 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1262036: Prevent TarFiles from being added to themselves under certain conditions. Will backport to 2.5. ........ r53159 | andrew.kuchling | 2006-12-27 04:25:31 +0100 (Wed, 27 Dec 2006) | 4 lines [Part of patch #1182394] Move the HMAC blocksize to be a class-level constant; this allows changing it in a subclass. To accommodate this, copy() now uses __class__. Also add some text to a comment. ........ r53160 | andrew.kuchling | 2006-12-27 04:31:24 +0100 (Wed, 27 Dec 2006) | 1 line [Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method ........ r53161 | lars.gustaebel | 2006-12-27 11:30:46 +0100 (Wed, 27 Dec 2006) | 4 lines Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. Will backport to 2.5. ........ r53165 | neal.norwitz | 2006-12-28 05:39:20 +0100 (Thu, 28 Dec 2006) | 1 line Remove a stray (old) macro name left around (I guess) ........ r53188 | neal.norwitz | 2006-12-29 04:01:53 +0100 (Fri, 29 Dec 2006) | 1 line SF bug #1623890, fix argument name in docstring ........ r53200 | raymond.hettinger | 2006-12-30 05:01:17 +0100 (Sat, 30 Dec 2006) | 1 line For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. ........ r53232 | brett.cannon | 2007-01-04 01:23:49 +0100 (Thu, 04 Jan 2007) | 3 lines Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. ........ r53235 | neal.norwitz | 2007-01-04 07:25:31 +0100 (Thu, 04 Jan 2007) | 1 line SF #1627373, fix typo in CarbonEvt. ........ r53244 | raymond.hettinger | 2007-01-04 18:53:34 +0100 (Thu, 04 Jan 2007) | 1 line Fix stability of heapq's nlargest() and nsmallest(). ........ r53249 | martin.v.loewis | 2007-01-04 22:06:12 +0100 (Thu, 04 Jan 2007) | 3 lines Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, to avoid relying on atexit. Will backport to 2.5. ........ r53252 | gregory.p.smith | 2007-01-05 02:59:42 +0100 (Fri, 05 Jan 2007) | 3 lines Support linking of the bsddb module against BerkeleyDB 4.5.x (will backport to 2.5) ........ r53253 | gregory.p.smith | 2007-01-05 03:06:17 +0100 (Fri, 05 Jan 2007) | 2 lines bump module version to match supported berkeleydb version ........ r53255 | neal.norwitz | 2007-01-05 06:25:22 +0100 (Fri, 05 Jan 2007) | 6 lines Prevent crash on shutdown which can occur if we are finalizing and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. ........ r53258 | gregory.p.smith | 2007-01-05 08:21:35 +0100 (Fri, 05 Jan 2007) | 2 lines typo fix ........ r53260 | neal.norwitz | 2007-01-05 09:06:43 +0100 (Fri, 05 Jan 2007) | 1 line Add Collin Winter for access to update PEP 3107 ........ r53262 | andrew.kuchling | 2007-01-05 15:22:17 +0100 (Fri, 05 Jan 2007) | 1 line [Bug #1622533] Make docstrings raw strings because they contain control characters (\0, \1) ........ r53264 | andrew.kuchling | 2007-01-05 16:51:24 +0100 (Fri, 05 Jan 2007) | 1 line [Patch #1520904] Fix bsddb tests to write to the temp directory instead of the Lib/bsddb/test directory ........ r53279 | brett.cannon | 2007-01-05 22:45:09 +0100 (Fri, 05 Jan 2007) | 3 lines Silence a warning from gcc 4.0.1 by specifying a function's parameter list is 'void' instead of just a set of empty parentheses. ........ r53285 | raymond.hettinger | 2007-01-06 02:14:41 +0100 (Sat, 06 Jan 2007) | 2 lines SF# 1409443: Expand comment to cover the interaction between f->f_lasti and the PREDICT macros. ........ r53286 | anthony.baxter | 2007-01-06 05:45:54 +0100 (Sat, 06 Jan 2007) | 1 line update to (c) years to include 2007 ........ r53291 | neal.norwitz | 2007-01-06 22:24:35 +0100 (Sat, 06 Jan 2007) | 1 line Add Josiah to SF for maintaining asyncore/asynchat ........ r53293 | peter.astrand | 2007-01-07 09:53:46 +0100 (Sun, 07 Jan 2007) | 1 line Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424. ........ r53295 | peter.astrand | 2007-01-07 15:34:16 +0100 (Sun, 07 Jan 2007) | 1 line Avoid O(N**2) bottleneck in _communicate_(). Fixes #1598181. ........ r53300 | raymond.hettinger | 2007-01-08 19:09:20 +0100 (Mon, 08 Jan 2007) | 1 line Fix zero-length corner case for iterating over a mutating deque. ........ r53301 | vinay.sajip | 2007-01-08 19:50:32 +0100 (Mon, 08 Jan 2007) | 4 lines Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped. Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped. (SF #411881) ........ r53302 | vinay.sajip | 2007-01-08 19:51:46 +0100 (Mon, 08 Jan 2007) | 2 lines Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped. (SF #411881) ........ r53303 | vinay.sajip | 2007-01-08 19:52:36 +0100 (Mon, 08 Jan 2007) | 1 line Added entries about removal of some bare except clauses from logging. ........

author	Thomas Wouters <thomas@python.org>
date	Tue, 09 Jan 2007 23:18:33 +0000
parents	cc992d75d5b3
children	4aee3f672f77

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

Mercurial > cpython-lru_cache-weakref

annotate Python/pythonrun.c @ 40582:67287ca4e1e8