which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
1840 lines
44 KiB
C
1840 lines
44 KiB
C
|
|
/* Python interpreter top-level routines, including init/exit */
|
|
|
|
#include "Python.h"
|
|
|
|
#include "Python-ast.h"
|
|
#include "grammar.h"
|
|
#include "node.h"
|
|
#include "token.h"
|
|
#include "parsetok.h"
|
|
#include "errcode.h"
|
|
#include "code.h"
|
|
#include "compile.h"
|
|
#include "symtable.h"
|
|
#include "pyarena.h"
|
|
#include "ast.h"
|
|
#include "eval.h"
|
|
#include "marshal.h"
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
#include <signal.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_LANGINFO_H
|
|
#include <locale.h>
|
|
#include <langinfo.h>
|
|
#endif
|
|
|
|
#ifdef MS_WINDOWS
|
|
#undef BYTE
|
|
#include "windows.h"
|
|
#endif
|
|
|
|
#ifndef Py_REF_DEBUG
|
|
#define PRINT_TOTAL_REFS()
|
|
#else /* Py_REF_DEBUG */
|
|
#define PRINT_TOTAL_REFS() fprintf(stderr, \
|
|
"[%" PY_FORMAT_SIZE_T "d refs]\n", \
|
|
_Py_GetRefTotal())
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern char *Py_GetPath(void);
|
|
|
|
extern grammar _PyParser_Grammar; /* From graminit.c */
|
|
|
|
/* Forward */
|
|
static void initmain(void);
|
|
static void initsite(void);
|
|
static PyObject *run_mod(mod_ty, const char *, PyObject *, PyObject *,
|
|
PyCompilerFlags *, PyArena *);
|
|
static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *,
|
|
PyCompilerFlags *);
|
|
static void err_input(perrdetail *);
|
|
static void initsigs(void);
|
|
static void call_sys_exitfunc(void);
|
|
static void call_ll_exitfuncs(void);
|
|
extern void _PyUnicode_Init(void);
|
|
extern void _PyUnicode_Fini(void);
|
|
|
|
#ifdef WITH_THREAD
|
|
extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
|
|
extern void _PyGILState_Fini(void);
|
|
#endif /* WITH_THREAD */
|
|
|
|
int Py_DebugFlag; /* Needed by parser.c */
|
|
int Py_VerboseFlag; /* Needed by import.c */
|
|
int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
|
|
int Py_NoSiteFlag; /* Suppress 'import site' */
|
|
int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
|
|
int Py_FrozenFlag; /* Needed by getpath.c */
|
|
int Py_UnicodeFlag = 0; /* Needed by compile.c */
|
|
int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
|
|
|
|
/* Reference to 'warnings' module, to avoid importing it
|
|
on the fly when the import lock may be held. See 683658/771097
|
|
*/
|
|
static PyObject *warnings_module = NULL;
|
|
|
|
/* Returns a borrowed reference to the 'warnings' module, or NULL.
|
|
If the module is returned, it is guaranteed to have been obtained
|
|
without acquiring the import lock
|
|
*/
|
|
PyObject *PyModule_GetWarningsModule(void)
|
|
{
|
|
PyObject *typ, *val, *tb;
|
|
PyObject *all_modules;
|
|
/* If we managed to get the module at init time, just use it */
|
|
if (warnings_module)
|
|
return warnings_module;
|
|
/* If it wasn't available at init time, it may be available
|
|
now in sys.modules (common scenario is frozen apps: import
|
|
at init time fails, but the frozen init code sets up sys.path
|
|
correctly, then does an implicit import of warnings for us
|
|
*/
|
|
/* Save and restore any exceptions */
|
|
PyErr_Fetch(&typ, &val, &tb);
|
|
|
|
all_modules = PySys_GetObject("modules");
|
|
if (all_modules) {
|
|
warnings_module = PyDict_GetItemString(all_modules, "warnings");
|
|
/* We keep a ref in the global */
|
|
Py_XINCREF(warnings_module);
|
|
}
|
|
PyErr_Restore(typ, val, tb);
|
|
return warnings_module;
|
|
}
|
|
|
|
static int initialized = 0;
|
|
|
|
/* API to access the initialized flag -- useful for esoteric use */
|
|
|
|
int
|
|
Py_IsInitialized(void)
|
|
{
|
|
return initialized;
|
|
}
|
|
|
|
/* Global initializations. Can be undone by Py_Finalize(). Don't
|
|
call this twice without an intervening Py_Finalize() call. When
|
|
initializations fail, a fatal error is issued and the function does
|
|
not return. On return, the first thread and interpreter state have
|
|
been created.
|
|
|
|
Locking: you must hold the interpreter lock while calling this.
|
|
(If the lock has not yet been initialized, that's equivalent to
|
|
having the lock, but you cannot use multiple threads.)
|
|
|
|
*/
|
|
|
|
static int
|
|
add_flag(int flag, const char *envs)
|
|
{
|
|
int env = atoi(envs);
|
|
if (flag < env)
|
|
flag = env;
|
|
if (flag < 1)
|
|
flag = 1;
|
|
return flag;
|
|
}
|
|
|
|
void
|
|
Py_InitializeEx(int install_sigs)
|
|
{
|
|
PyInterpreterState *interp;
|
|
PyThreadState *tstate;
|
|
PyObject *bimod, *sysmod;
|
|
char *p;
|
|
#if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET)
|
|
char *codeset;
|
|
char *saved_locale;
|
|
PyObject *sys_stream, *sys_isatty;
|
|
#endif
|
|
extern void _Py_ReadyTypes(void);
|
|
|
|
if (initialized)
|
|
return;
|
|
initialized = 1;
|
|
|
|
if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
|
|
Py_DebugFlag = add_flag(Py_DebugFlag, p);
|
|
if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
|
|
Py_VerboseFlag = add_flag(Py_VerboseFlag, p);
|
|
if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
|
|
Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
|
|
|
|
interp = PyInterpreterState_New();
|
|
if (interp == NULL)
|
|
Py_FatalError("Py_Initialize: can't make first interpreter");
|
|
|
|
tstate = PyThreadState_New(interp);
|
|
if (tstate == NULL)
|
|
Py_FatalError("Py_Initialize: can't make first thread");
|
|
(void) PyThreadState_Swap(tstate);
|
|
|
|
_Py_ReadyTypes();
|
|
|
|
if (!_PyFrame_Init())
|
|
Py_FatalError("Py_Initialize: can't init frames");
|
|
|
|
if (!_PyInt_Init())
|
|
Py_FatalError("Py_Initialize: can't init ints");
|
|
|
|
_PyFloat_Init();
|
|
|
|
interp->modules = PyDict_New();
|
|
if (interp->modules == NULL)
|
|
Py_FatalError("Py_Initialize: can't make modules dictionary");
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
/* Init Unicode implementation; relies on the codec registry */
|
|
_PyUnicode_Init();
|
|
#endif
|
|
|
|
bimod = _PyBuiltin_Init();
|
|
if (bimod == NULL)
|
|
Py_FatalError("Py_Initialize: can't initialize __builtin__");
|
|
interp->builtins = PyModule_GetDict(bimod);
|
|
if (interp->builtins == NULL)
|
|
Py_FatalError("Py_Initialize: can't initialize builtins dict");
|
|
Py_INCREF(interp->builtins);
|
|
|
|
sysmod = _PySys_Init();
|
|
if (sysmod == NULL)
|
|
Py_FatalError("Py_Initialize: can't initialize sys");
|
|
interp->sysdict = PyModule_GetDict(sysmod);
|
|
if (interp->sysdict == NULL)
|
|
Py_FatalError("Py_Initialize: can't initialize sys dict");
|
|
Py_INCREF(interp->sysdict);
|
|
_PyImport_FixupExtension("sys", "sys");
|
|
PySys_SetPath(Py_GetPath());
|
|
PyDict_SetItemString(interp->sysdict, "modules",
|
|
interp->modules);
|
|
|
|
_PyImport_Init();
|
|
|
|
/* initialize builtin exceptions */
|
|
_PyExc_Init();
|
|
_PyImport_FixupExtension("exceptions", "exceptions");
|
|
|
|
/* phase 2 of builtins */
|
|
_PyImport_FixupExtension("__builtin__", "__builtin__");
|
|
|
|
_PyImportHooks_Init();
|
|
|
|
if (install_sigs)
|
|
initsigs(); /* Signal handling stuff, including initintr() */
|
|
|
|
initmain(); /* Module __main__ */
|
|
if (!Py_NoSiteFlag)
|
|
initsite(); /* Module site */
|
|
|
|
/* auto-thread-state API, if available */
|
|
#ifdef WITH_THREAD
|
|
_PyGILState_Init(interp, tstate);
|
|
#endif /* WITH_THREAD */
|
|
|
|
warnings_module = PyImport_ImportModule("warnings");
|
|
if (!warnings_module)
|
|
PyErr_Clear();
|
|
|
|
#if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET)
|
|
/* On Unix, set the file system encoding according to the
|
|
user's preference, if the CODESET names a well-known
|
|
Python codec, and Py_FileSystemDefaultEncoding isn't
|
|
initialized by other means. Also set the encoding of
|
|
stdin and stdout if these are terminals. */
|
|
|
|
saved_locale = strdup(setlocale(LC_CTYPE, NULL));
|
|
setlocale(LC_CTYPE, "");
|
|
codeset = nl_langinfo(CODESET);
|
|
if (codeset && *codeset) {
|
|
PyObject *enc = PyCodec_Encoder(codeset);
|
|
if (enc) {
|
|
codeset = strdup(codeset);
|
|
Py_DECREF(enc);
|
|
} else {
|
|
codeset = NULL;
|
|
PyErr_Clear();
|
|
}
|
|
} else
|
|
codeset = NULL;
|
|
setlocale(LC_CTYPE, saved_locale);
|
|
free(saved_locale);
|
|
|
|
if (codeset) {
|
|
sys_stream = PySys_GetObject("stdin");
|
|
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
|
|
if (!sys_isatty)
|
|
PyErr_Clear();
|
|
if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
|
|
if (!PyFile_SetEncoding(sys_stream, codeset))
|
|
Py_FatalError("Cannot set codeset of stdin");
|
|
}
|
|
Py_XDECREF(sys_isatty);
|
|
|
|
sys_stream = PySys_GetObject("stdout");
|
|
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
|
|
if (!sys_isatty)
|
|
PyErr_Clear();
|
|
if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
|
|
if (!PyFile_SetEncoding(sys_stream, codeset))
|
|
Py_FatalError("Cannot set codeset of stdout");
|
|
}
|
|
Py_XDECREF(sys_isatty);
|
|
|
|
sys_stream = PySys_GetObject("stderr");
|
|
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
|
|
if (!sys_isatty)
|
|
PyErr_Clear();
|
|
if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
|
|
if (!PyFile_SetEncoding(sys_stream, codeset))
|
|
Py_FatalError("Cannot set codeset of stderr");
|
|
}
|
|
Py_XDECREF(sys_isatty);
|
|
|
|
if (!Py_FileSystemDefaultEncoding)
|
|
Py_FileSystemDefaultEncoding = codeset;
|
|
else
|
|
free(codeset);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void
|
|
Py_Initialize(void)
|
|
{
|
|
Py_InitializeEx(1);
|
|
}
|
|
|
|
|
|
#ifdef COUNT_ALLOCS
|
|
extern void dump_counts(FILE*);
|
|
#endif
|
|
|
|
/* Undo the effect of Py_Initialize().
|
|
|
|
Beware: if multiple interpreter and/or thread states exist, these
|
|
are not wiped out; only the current thread and interpreter state
|
|
are deleted. But since everything else is deleted, those other
|
|
interpreter and thread states should no longer be used.
|
|
|
|
(XXX We should do better, e.g. wipe out all interpreters and
|
|
threads.)
|
|
|
|
Locking: as above.
|
|
|
|
*/
|
|
|
|
void
|
|
Py_Finalize(void)
|
|
{
|
|
PyInterpreterState *interp;
|
|
PyThreadState *tstate;
|
|
|
|
if (!initialized)
|
|
return;
|
|
|
|
/* The interpreter is still entirely intact at this point, and the
|
|
* exit funcs may be relying on that. In particular, if some thread
|
|
* or exit func is still waiting to do an import, the import machinery
|
|
* expects Py_IsInitialized() to return true. So don't say the
|
|
* interpreter is uninitialized until after the exit funcs have run.
|
|
* Note that Threading.py uses an exit func to do a join on all the
|
|
* threads created thru it, so this also protects pending imports in
|
|
* the threads created via Threading.
|
|
*/
|
|
call_sys_exitfunc();
|
|
initialized = 0;
|
|
|
|
/* Get current thread state and interpreter pointer */
|
|
tstate = PyThreadState_GET();
|
|
interp = tstate->interp;
|
|
|
|
/* Disable signal handling */
|
|
PyOS_FiniInterrupts();
|
|
|
|
/* drop module references we saved */
|
|
Py_XDECREF(warnings_module);
|
|
warnings_module = NULL;
|
|
|
|
/* Collect garbage. This may call finalizers; it's nice to call these
|
|
* before all modules are destroyed.
|
|
* XXX If a __del__ or weakref callback is triggered here, and tries to
|
|
* XXX import a module, bad things can happen, because Python no
|
|
* XXX longer believes it's initialized.
|
|
* XXX Fatal Python error: Interpreter not initialized (version mismatch?)
|
|
* XXX is easy to provoke that way. I've also seen, e.g.,
|
|
* XXX Exception exceptions.ImportError: 'No module named sha'
|
|
* XXX in <function callback at 0x008F5718> ignored
|
|
* XXX but I'm unclear on exactly how that one happens. In any case,
|
|
* XXX I haven't seen a real-life report of either of these.
|
|
*/
|
|
PyGC_Collect();
|
|
#ifdef COUNT_ALLOCS
|
|
/* With COUNT_ALLOCS, it helps to run GC multiple times:
|
|
each collection might release some types from the type
|
|
list, so they become garbage. */
|
|
while (PyGC_Collect() > 0)
|
|
/* nothing */;
|
|
#endif
|
|
|
|
/* Destroy all modules */
|
|
PyImport_Cleanup();
|
|
|
|
/* Collect final garbage. This disposes of cycles created by
|
|
* new-style class definitions, for example.
|
|
* XXX This is disabled because it caused too many problems. If
|
|
* XXX a __del__ or weakref callback triggers here, Python code has
|
|
* XXX a hard time running, because even the sys module has been
|
|
* XXX cleared out (sys.stdout is gone, sys.excepthook is gone, etc).
|
|
* XXX One symptom is a sequence of information-free messages
|
|
* XXX coming from threads (if a __del__ or callback is invoked,
|
|
* XXX other threads can execute too, and any exception they encounter
|
|
* XXX triggers a comedy of errors as subsystem after subsystem
|
|
* XXX fails to find what it *expects* to find in sys to help report
|
|
* XXX the exception and consequent unexpected failures). I've also
|
|
* XXX seen segfaults then, after adding print statements to the
|
|
* XXX Python code getting called.
|
|
*/
|
|
#if 0
|
|
PyGC_Collect();
|
|
#endif
|
|
|
|
/* Destroy the database used by _PyImport_{Fixup,Find}Extension */
|
|
_PyImport_Fini();
|
|
|
|
/* Debugging stuff */
|
|
#ifdef COUNT_ALLOCS
|
|
dump_counts(stdout);
|
|
#endif
|
|
|
|
PRINT_TOTAL_REFS();
|
|
|
|
#ifdef Py_TRACE_REFS
|
|
/* Display all objects still alive -- this can invoke arbitrary
|
|
* __repr__ overrides, so requires a mostly-intact interpreter.
|
|
* Alas, a lot of stuff may still be alive now that will be cleaned
|
|
* up later.
|
|
*/
|
|
if (Py_GETENV("PYTHONDUMPREFS"))
|
|
_Py_PrintReferences(stderr);
|
|
#endif /* Py_TRACE_REFS */
|
|
|
|
/* Cleanup auto-thread-state */
|
|
#ifdef WITH_THREAD
|
|
_PyGILState_Fini();
|
|
#endif /* WITH_THREAD */
|
|
|
|
/* Clear interpreter state */
|
|
PyInterpreterState_Clear(interp);
|
|
|
|
/* Now we decref the exception classes. After this point nothing
|
|
can raise an exception. That's okay, because each Fini() method
|
|
below has been checked to make sure no exceptions are ever
|
|
raised.
|
|
*/
|
|
|
|
_PyExc_Fini();
|
|
|
|
/* Delete current thread */
|
|
PyThreadState_Swap(NULL);
|
|
PyInterpreterState_Delete(interp);
|
|
|
|
/* Sundry finalizers */
|
|
PyMethod_Fini();
|
|
PyFrame_Fini();
|
|
PyCFunction_Fini();
|
|
PyTuple_Fini();
|
|
PyList_Fini();
|
|
PySet_Fini();
|
|
PyString_Fini();
|
|
PyInt_Fini();
|
|
PyFloat_Fini();
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
/* Cleanup Unicode implementation */
|
|
_PyUnicode_Fini();
|
|
#endif
|
|
|
|
/* XXX Still allocated:
|
|
- various static ad-hoc pointers to interned strings
|
|
- int and float free list blocks
|
|
- whatever various modules and libraries allocate
|
|
*/
|
|
|
|
PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
|
|
|
|
#ifdef Py_TRACE_REFS
|
|
/* Display addresses (& refcnts) of all objects still alive.
|
|
* An address can be used to find the repr of the object, printed
|
|
* above by _Py_PrintReferences.
|
|
*/
|
|
if (Py_GETENV("PYTHONDUMPREFS"))
|
|
_Py_PrintReferenceAddresses(stderr);
|
|
#endif /* Py_TRACE_REFS */
|
|
#ifdef PYMALLOC_DEBUG
|
|
if (Py_GETENV("PYTHONMALLOCSTATS"))
|
|
_PyObject_DebugMallocStats();
|
|
#endif
|
|
|
|
call_ll_exitfuncs();
|
|
}
|
|
|
|
/* Create and initialize a new interpreter and thread, and return the
|
|
new thread. This requires that Py_Initialize() has been called
|
|
first.
|
|
|
|
Unsuccessful initialization yields a NULL pointer. Note that *no*
|
|
exception information is available even in this case -- the
|
|
exception information is held in the thread, and there is no
|
|
thread.
|
|
|
|
Locking: as above.
|
|
|
|
*/
|
|
|
|
PyThreadState *
|
|
Py_NewInterpreter(void)
|
|
{
|
|
PyInterpreterState *interp;
|
|
PyThreadState *tstate, *save_tstate;
|
|
PyObject *bimod, *sysmod;
|
|
|
|
if (!initialized)
|
|
Py_FatalError("Py_NewInterpreter: call Py_Initialize first");
|
|
|
|
interp = PyInterpreterState_New();
|
|
if (interp == NULL)
|
|
return NULL;
|
|
|
|
tstate = PyThreadState_New(interp);
|
|
if (tstate == NULL) {
|
|
PyInterpreterState_Delete(interp);
|
|
return NULL;
|
|
}
|
|
|
|
save_tstate = PyThreadState_Swap(tstate);
|
|
|
|
/* XXX The following is lax in error checking */
|
|
|
|
interp->modules = PyDict_New();
|
|
|
|
bimod = _PyImport_FindExtension("__builtin__", "__builtin__");
|
|
if (bimod != NULL) {
|
|
interp->builtins = PyModule_GetDict(bimod);
|
|
Py_INCREF(interp->builtins);
|
|
}
|
|
sysmod = _PyImport_FindExtension("sys", "sys");
|
|
if (bimod != NULL && sysmod != NULL) {
|
|
interp->sysdict = PyModule_GetDict(sysmod);
|
|
Py_INCREF(interp->sysdict);
|
|
PySys_SetPath(Py_GetPath());
|
|
PyDict_SetItemString(interp->sysdict, "modules",
|
|
interp->modules);
|
|
_PyImportHooks_Init();
|
|
initmain();
|
|
if (!Py_NoSiteFlag)
|
|
initsite();
|
|
}
|
|
|
|
if (!PyErr_Occurred())
|
|
return tstate;
|
|
|
|
/* Oops, it didn't work. Undo it all. */
|
|
|
|
PyErr_Print();
|
|
PyThreadState_Clear(tstate);
|
|
PyThreadState_Swap(save_tstate);
|
|
PyThreadState_Delete(tstate);
|
|
PyInterpreterState_Delete(interp);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Delete an interpreter and its last thread. This requires that the
|
|
given thread state is current, that the thread has no remaining
|
|
frames, and that it is its interpreter's only remaining thread.
|
|
It is a fatal error to violate these constraints.
|
|
|
|
(Py_Finalize() doesn't have these constraints -- it zaps
|
|
everything, regardless.)
|
|
|
|
Locking: as above.
|
|
|
|
*/
|
|
|
|
void
|
|
Py_EndInterpreter(PyThreadState *tstate)
|
|
{
|
|
PyInterpreterState *interp = tstate->interp;
|
|
|
|
if (tstate != PyThreadState_GET())
|
|
Py_FatalError("Py_EndInterpreter: thread is not current");
|
|
if (tstate->frame != NULL)
|
|
Py_FatalError("Py_EndInterpreter: thread still has a frame");
|
|
if (tstate != interp->tstate_head || tstate->next != NULL)
|
|
Py_FatalError("Py_EndInterpreter: not the last thread");
|
|
|
|
PyImport_Cleanup();
|
|
PyInterpreterState_Clear(interp);
|
|
PyThreadState_Swap(NULL);
|
|
PyInterpreterState_Delete(interp);
|
|
}
|
|
|
|
static char *progname = "python";
|
|
|
|
void
|
|
Py_SetProgramName(char *pn)
|
|
{
|
|
if (pn && *pn)
|
|
progname = pn;
|
|
}
|
|
|
|
char *
|
|
Py_GetProgramName(void)
|
|
{
|
|
return progname;
|
|
}
|
|
|
|
static char *default_home = NULL;
|
|
|
|
void
|
|
Py_SetPythonHome(char *home)
|
|
{
|
|
default_home = home;
|
|
}
|
|
|
|
char *
|
|
Py_GetPythonHome(void)
|
|
{
|
|
char *home = default_home;
|
|
if (home == NULL && !Py_IgnoreEnvironmentFlag)
|
|
home = Py_GETENV("PYTHONHOME");
|
|
return home;
|
|
}
|
|
|
|
/* Create __main__ module */
|
|
|
|
static void
|
|
initmain(void)
|
|
{
|
|
PyObject *m, *d;
|
|
m = PyImport_AddModule("__main__");
|
|
if (m == NULL)
|
|
Py_FatalError("can't create __main__ module");
|
|
d = PyModule_GetDict(m);
|
|
if (PyDict_GetItemString(d, "__builtins__") == NULL) {
|
|
PyObject *bimod = PyImport_ImportModule("__builtin__");
|
|
if (bimod == NULL ||
|
|
PyDict_SetItemString(d, "__builtins__", bimod) != 0)
|
|
Py_FatalError("can't add __builtins__ to __main__");
|
|
Py_DECREF(bimod);
|
|
}
|
|
}
|
|
|
|
/* Import the site module (not into __main__ though) */
|
|
|
|
static void
|
|
initsite(void)
|
|
{
|
|
PyObject *m, *f;
|
|
m = PyImport_ImportModule("site");
|
|
if (m == NULL) {
|
|
f = PySys_GetObject("stderr");
|
|
if (Py_VerboseFlag) {
|
|
PyFile_WriteString(
|
|
"'import site' failed; traceback:\n", f);
|
|
PyErr_Print();
|
|
}
|
|
else {
|
|
PyFile_WriteString(
|
|
"'import site' failed; use -v for traceback\n", f);
|
|
PyErr_Clear();
|
|
}
|
|
}
|
|
else {
|
|
Py_DECREF(m);
|
|
}
|
|
}
|
|
|
|
/* Parse input from a file and execute it */
|
|
|
|
int
|
|
PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
|
|
PyCompilerFlags *flags)
|
|
{
|
|
if (filename == NULL)
|
|
filename = "???";
|
|
if (Py_FdIsInteractive(fp, filename)) {
|
|
int err = PyRun_InteractiveLoopFlags(fp, filename, flags);
|
|
if (closeit)
|
|
fclose(fp);
|
|
return err;
|
|
}
|
|
else
|
|
return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
|
|
}
|
|
|
|
int
|
|
PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
|
|
{
|
|
PyObject *v;
|
|
int ret;
|
|
PyCompilerFlags local_flags;
|
|
|
|
if (flags == NULL) {
|
|
flags = &local_flags;
|
|
local_flags.cf_flags = 0;
|
|
}
|
|
v = PySys_GetObject("ps1");
|
|
if (v == NULL) {
|
|
PySys_SetObject("ps1", v = PyString_FromString(">>> "));
|
|
Py_XDECREF(v);
|
|
}
|
|
v = PySys_GetObject("ps2");
|
|
if (v == NULL) {
|
|
PySys_SetObject("ps2", v = PyString_FromString("... "));
|
|
Py_XDECREF(v);
|
|
}
|
|
for (;;) {
|
|
ret = PyRun_InteractiveOneFlags(fp, filename, flags);
|
|
PRINT_TOTAL_REFS();
|
|
if (ret == E_EOF)
|
|
return 0;
|
|
/*
|
|
if (ret == E_NOMEM)
|
|
return -1;
|
|
*/
|
|
}
|
|
}
|
|
|
|
/* compute parser flags based on compiler flags */
|
|
#define PARSER_FLAGS(flags) \
|
|
((flags) ? ((((flags)->cf_flags & PyCF_DONT_IMPLY_DEDENT) ? \
|
|
PyPARSE_DONT_IMPLY_DEDENT : 0)) : 0)
|
|
|
|
int
|
|
PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
|
|
{
|
|
PyObject *m, *d, *v, *w;
|
|
mod_ty mod;
|
|
PyArena *arena;
|
|
char *ps1 = "", *ps2 = "";
|
|
int errcode = 0;
|
|
|
|
v = PySys_GetObject("ps1");
|
|
if (v != NULL) {
|
|
v = PyObject_Str(v);
|
|
if (v == NULL)
|
|
PyErr_Clear();
|
|
else if (PyString_Check(v))
|
|
ps1 = PyString_AsString(v);
|
|
}
|
|
w = PySys_GetObject("ps2");
|
|
if (w != NULL) {
|
|
w = PyObject_Str(w);
|
|
if (w == NULL)
|
|
PyErr_Clear();
|
|
else if (PyString_Check(w))
|
|
ps2 = PyString_AsString(w);
|
|
}
|
|
arena = PyArena_New();
|
|
if (arena == NULL) {
|
|
Py_XDECREF(v);
|
|
Py_XDECREF(w);
|
|
return -1;
|
|
}
|
|
mod = PyParser_ASTFromFile(fp, filename,
|
|
Py_single_input, ps1, ps2,
|
|
flags, &errcode, arena);
|
|
Py_XDECREF(v);
|
|
Py_XDECREF(w);
|
|
if (mod == NULL) {
|
|
PyArena_Free(arena);
|
|
if (errcode == E_EOF) {
|
|
PyErr_Clear();
|
|
return E_EOF;
|
|
}
|
|
PyErr_Print();
|
|
return -1;
|
|
}
|
|
m = PyImport_AddModule("__main__");
|
|
if (m == NULL) {
|
|
PyArena_Free(arena);
|
|
return -1;
|
|
}
|
|
d = PyModule_GetDict(m);
|
|
v = run_mod(mod, filename, d, d, flags, arena);
|
|
PyArena_Free(arena);
|
|
if (v == NULL) {
|
|
PyErr_Print();
|
|
return -1;
|
|
}
|
|
Py_DECREF(v);
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
return 0;
|
|
}
|
|
|
|
/* Check whether a file maybe a pyc file: Look at the extension,
|
|
the file type, and, if we may close it, at the first few bytes. */
|
|
|
|
static int
|
|
maybe_pyc_file(FILE *fp, const char* filename, const char* ext, int closeit)
|
|
{
|
|
if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0)
|
|
return 1;
|
|
|
|
/* Only look into the file if we are allowed to close it, since
|
|
it then should also be seekable. */
|
|
if (closeit) {
|
|
/* Read only two bytes of the magic. If the file was opened in
|
|
text mode, the bytes 3 and 4 of the magic (\r\n) might not
|
|
be read as they are on disk. */
|
|
unsigned int halfmagic = PyImport_GetMagicNumber() & 0xFFFF;
|
|
unsigned char buf[2];
|
|
/* Mess: In case of -x, the stream is NOT at its start now,
|
|
and ungetc() was used to push back the first newline,
|
|
which makes the current stream position formally undefined,
|
|
and a x-platform nightmare.
|
|
Unfortunately, we have no direct way to know whether -x
|
|
was specified. So we use a terrible hack: if the current
|
|
stream position is not 0, we assume -x was specified, and
|
|
give up. Bug 132850 on SourceForge spells out the
|
|
hopelessness of trying anything else (fseek and ftell
|
|
don't work predictably x-platform for text-mode files).
|
|
*/
|
|
int ispyc = 0;
|
|
if (ftell(fp) == 0) {
|
|
if (fread(buf, 1, 2, fp) == 2 &&
|
|
((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
|
|
ispyc = 1;
|
|
rewind(fp);
|
|
}
|
|
return ispyc;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
|
|
PyCompilerFlags *flags)
|
|
{
|
|
PyObject *m, *d, *v;
|
|
const char *ext;
|
|
|
|
m = PyImport_AddModule("__main__");
|
|
if (m == NULL)
|
|
return -1;
|
|
d = PyModule_GetDict(m);
|
|
if (PyDict_GetItemString(d, "__file__") == NULL) {
|
|
PyObject *f = PyString_FromString(filename);
|
|
if (f == NULL)
|
|
return -1;
|
|
if (PyDict_SetItemString(d, "__file__", f) < 0) {
|
|
Py_DECREF(f);
|
|
return -1;
|
|
}
|
|
Py_DECREF(f);
|
|
}
|
|
ext = filename + strlen(filename) - 4;
|
|
if (maybe_pyc_file(fp, filename, ext, closeit)) {
|
|
/* Try to run a pyc file. First, re-open in binary */
|
|
if (closeit)
|
|
fclose(fp);
|
|
if ((fp = fopen(filename, "rb")) == NULL) {
|
|
fprintf(stderr, "python: Can't reopen .pyc file\n");
|
|
return -1;
|
|
}
|
|
/* Turn on optimization if a .pyo file is given */
|
|
if (strcmp(ext, ".pyo") == 0)
|
|
Py_OptimizeFlag = 1;
|
|
v = run_pyc_file(fp, filename, d, d, flags);
|
|
} else {
|
|
v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
|
|
closeit, flags);
|
|
}
|
|
if (v == NULL) {
|
|
PyErr_Print();
|
|
return -1;
|
|
}
|
|
Py_DECREF(v);
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
|
|
{
|
|
PyObject *m, *d, *v;
|
|
m = PyImport_AddModule("__main__");
|
|
if (m == NULL)
|
|
return -1;
|
|
d = PyModule_GetDict(m);
|
|
v = PyRun_StringFlags(command, Py_file_input, d, d, flags);
|
|
if (v == NULL) {
|
|
PyErr_Print();
|
|
return -1;
|
|
}
|
|
Py_DECREF(v);
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
|
|
int *lineno, int *offset, const char **text)
|
|
{
|
|
long hold;
|
|
PyObject *v;
|
|
|
|
/* old style errors */
|
|
if (PyTuple_Check(err))
|
|
return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
|
|
lineno, offset, text);
|
|
|
|
/* new style errors. `err' is an instance */
|
|
|
|
if (! (v = PyObject_GetAttrString(err, "msg")))
|
|
goto finally;
|
|
*message = v;
|
|
|
|
if (!(v = PyObject_GetAttrString(err, "filename")))
|
|
goto finally;
|
|
if (v == Py_None)
|
|
*filename = NULL;
|
|
else if (! (*filename = PyString_AsString(v)))
|
|
goto finally;
|
|
|
|
Py_DECREF(v);
|
|
if (!(v = PyObject_GetAttrString(err, "lineno")))
|
|
goto finally;
|
|
hold = PyInt_AsLong(v);
|
|
Py_DECREF(v);
|
|
v = NULL;
|
|
if (hold < 0 && PyErr_Occurred())
|
|
goto finally;
|
|
*lineno = (int)hold;
|
|
|
|
if (!(v = PyObject_GetAttrString(err, "offset")))
|
|
goto finally;
|
|
if (v == Py_None) {
|
|
*offset = -1;
|
|
Py_DECREF(v);
|
|
v = NULL;
|
|
} else {
|
|
hold = PyInt_AsLong(v);
|
|
Py_DECREF(v);
|
|
v = NULL;
|
|
if (hold < 0 && PyErr_Occurred())
|
|
goto finally;
|
|
*offset = (int)hold;
|
|
}
|
|
|
|
if (!(v = PyObject_GetAttrString(err, "text")))
|
|
goto finally;
|
|
if (v == Py_None)
|
|
*text = NULL;
|
|
else if (! (*text = PyString_AsString(v)))
|
|
goto finally;
|
|
Py_DECREF(v);
|
|
return 1;
|
|
|
|
finally:
|
|
Py_XDECREF(v);
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
PyErr_Print(void)
|
|
{
|
|
PyErr_PrintEx(1);
|
|
}
|
|
|
|
static void
|
|
print_error_text(PyObject *f, int offset, const char *text)
|
|
{
|
|
char *nl;
|
|
if (offset >= 0) {
|
|
if (offset > 0 && offset == (int)strlen(text))
|
|
offset--;
|
|
for (;;) {
|
|
nl = strchr(text, '\n');
|
|
if (nl == NULL || nl-text >= offset)
|
|
break;
|
|
offset -= (int)(nl+1-text);
|
|
text = nl+1;
|
|
}
|
|
while (*text == ' ' || *text == '\t') {
|
|
text++;
|
|
offset--;
|
|
}
|
|
}
|
|
PyFile_WriteString(" ", f);
|
|
PyFile_WriteString(text, f);
|
|
if (*text == '\0' || text[strlen(text)-1] != '\n')
|
|
PyFile_WriteString("\n", f);
|
|
if (offset == -1)
|
|
return;
|
|
PyFile_WriteString(" ", f);
|
|
offset--;
|
|
while (offset > 0) {
|
|
PyFile_WriteString(" ", f);
|
|
offset--;
|
|
}
|
|
PyFile_WriteString("^\n", f);
|
|
}
|
|
|
|
static void
|
|
handle_system_exit(void)
|
|
{
|
|
PyObject *exception, *value, *tb;
|
|
int exitcode = 0;
|
|
|
|
PyErr_Fetch(&exception, &value, &tb);
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
fflush(stdout);
|
|
if (value == NULL || value == Py_None)
|
|
goto done;
|
|
if (PyExceptionInstance_Check(value)) {
|
|
/* The error code should be in the `code' attribute. */
|
|
PyObject *code = PyObject_GetAttrString(value, "code");
|
|
if (code) {
|
|
Py_DECREF(value);
|
|
value = code;
|
|
if (value == Py_None)
|
|
goto done;
|
|
}
|
|
/* If we failed to dig out the 'code' attribute,
|
|
just let the else clause below print the error. */
|
|
}
|
|
if (PyInt_Check(value))
|
|
exitcode = (int)PyInt_AsLong(value);
|
|
else {
|
|
PyObject_Print(value, stderr, Py_PRINT_RAW);
|
|
PySys_WriteStderr("\n");
|
|
exitcode = 1;
|
|
}
|
|
done:
|
|
/* Restore and clear the exception info, in order to properly decref
|
|
* the exception, value, and traceback. If we just exit instead,
|
|
* these leak, which confuses PYTHONDUMPREFS output, and may prevent
|
|
* some finalizers from running.
|
|
*/
|
|
PyErr_Restore(exception, value, tb);
|
|
PyErr_Clear();
|
|
Py_Exit(exitcode);
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
void
|
|
PyErr_PrintEx(int set_sys_last_vars)
|
|
{
|
|
PyObject *exception, *v, *tb, *hook;
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
|
|
handle_system_exit();
|
|
}
|
|
PyErr_Fetch(&exception, &v, &tb);
|
|
if (exception == NULL)
|
|
return;
|
|
PyErr_NormalizeException(&exception, &v, &tb);
|
|
if (exception == NULL)
|
|
return;
|
|
/* Now we know v != NULL too */
|
|
if (set_sys_last_vars) {
|
|
PySys_SetObject("last_type", exception);
|
|
PySys_SetObject("last_value", v);
|
|
PySys_SetObject("last_traceback", tb);
|
|
}
|
|
hook = PySys_GetObject("excepthook");
|
|
if (hook) {
|
|
PyObject *args = PyTuple_Pack(3,
|
|
exception, v, tb ? tb : Py_None);
|
|
PyObject *result = PyEval_CallObject(hook, args);
|
|
if (result == NULL) {
|
|
PyObject *exception2, *v2, *tb2;
|
|
if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
|
|
handle_system_exit();
|
|
}
|
|
PyErr_Fetch(&exception2, &v2, &tb2);
|
|
PyErr_NormalizeException(&exception2, &v2, &tb2);
|
|
/* It should not be possible for exception2 or v2
|
|
to be NULL. However PyErr_Display() can't
|
|
tolerate NULLs, so just be safe. */
|
|
if (exception2 == NULL) {
|
|
exception2 = Py_None;
|
|
Py_INCREF(exception2);
|
|
}
|
|
if (v2 == NULL) {
|
|
v2 = Py_None;
|
|
Py_INCREF(v2);
|
|
}
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
fflush(stdout);
|
|
PySys_WriteStderr("Error in sys.excepthook:\n");
|
|
PyErr_Display(exception2, v2, tb2);
|
|
PySys_WriteStderr("\nOriginal exception was:\n");
|
|
PyErr_Display(exception, v, tb);
|
|
Py_DECREF(exception2);
|
|
Py_DECREF(v2);
|
|
Py_XDECREF(tb2);
|
|
}
|
|
Py_XDECREF(result);
|
|
Py_XDECREF(args);
|
|
} else {
|
|
PySys_WriteStderr("sys.excepthook is missing\n");
|
|
PyErr_Display(exception, v, tb);
|
|
}
|
|
Py_XDECREF(exception);
|
|
Py_XDECREF(v);
|
|
Py_XDECREF(tb);
|
|
}
|
|
|
|
void
|
|
PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
|
|
{
|
|
int err = 0;
|
|
PyObject *f = PySys_GetObject("stderr");
|
|
Py_INCREF(value);
|
|
if (f == NULL)
|
|
fprintf(stderr, "lost sys.stderr\n");
|
|
else {
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
fflush(stdout);
|
|
if (tb && tb != Py_None)
|
|
err = PyTraceBack_Print(tb, f);
|
|
if (err == 0 &&
|
|
PyObject_HasAttrString(value, "print_file_and_line"))
|
|
{
|
|
PyObject *message;
|
|
const char *filename, *text;
|
|
int lineno, offset;
|
|
if (!parse_syntax_error(value, &message, &filename,
|
|
&lineno, &offset, &text))
|
|
PyErr_Clear();
|
|
else {
|
|
char buf[10];
|
|
PyFile_WriteString(" File \"", f);
|
|
if (filename == NULL)
|
|
PyFile_WriteString("<string>", f);
|
|
else
|
|
PyFile_WriteString(filename, f);
|
|
PyFile_WriteString("\", line ", f);
|
|
PyOS_snprintf(buf, sizeof(buf), "%d", lineno);
|
|
PyFile_WriteString(buf, f);
|
|
PyFile_WriteString("\n", f);
|
|
if (text != NULL)
|
|
print_error_text(f, offset, text);
|
|
Py_DECREF(value);
|
|
value = message;
|
|
/* Can't be bothered to check all those
|
|
PyFile_WriteString() calls */
|
|
if (PyErr_Occurred())
|
|
err = -1;
|
|
}
|
|
}
|
|
if (err) {
|
|
/* Don't do anything else */
|
|
}
|
|
else if (PyExceptionClass_Check(exception)) {
|
|
PyObject* moduleName;
|
|
char* className = PyExceptionClass_Name(exception);
|
|
if (className != NULL) {
|
|
char *dot = strrchr(className, '.');
|
|
if (dot != NULL)
|
|
className = dot+1;
|
|
}
|
|
|
|
moduleName = PyObject_GetAttrString(exception, "__module__");
|
|
if (moduleName == NULL)
|
|
err = PyFile_WriteString("<unknown>", f);
|
|
else {
|
|
char* modstr = PyString_AsString(moduleName);
|
|
if (modstr && strcmp(modstr, "exceptions"))
|
|
{
|
|
err = PyFile_WriteString(modstr, f);
|
|
err += PyFile_WriteString(".", f);
|
|
}
|
|
Py_DECREF(moduleName);
|
|
}
|
|
if (err == 0) {
|
|
if (className == NULL)
|
|
err = PyFile_WriteString("<unknown>", f);
|
|
else
|
|
err = PyFile_WriteString(className, f);
|
|
}
|
|
}
|
|
else
|
|
err = PyFile_WriteObject(exception, f, Py_PRINT_RAW);
|
|
if (err == 0 && (value != Py_None)) {
|
|
PyObject *s = PyObject_Str(value);
|
|
/* only print colon if the str() of the
|
|
object is not the empty string
|
|
*/
|
|
if (s == NULL)
|
|
err = -1;
|
|
else if (!PyString_Check(s) ||
|
|
PyString_GET_SIZE(s) != 0)
|
|
err = PyFile_WriteString(": ", f);
|
|
if (err == 0)
|
|
err = PyFile_WriteObject(s, f, Py_PRINT_RAW);
|
|
Py_XDECREF(s);
|
|
}
|
|
if (err == 0)
|
|
err = PyFile_WriteString("\n", f);
|
|
}
|
|
Py_DECREF(value);
|
|
/* If an error happened here, don't show it.
|
|
XXX This is wrong, but too many callers rely on this behavior. */
|
|
if (err != 0)
|
|
PyErr_Clear();
|
|
}
|
|
|
|
PyObject *
|
|
PyRun_StringFlags(const char *str, int start, PyObject *globals,
|
|
PyObject *locals, PyCompilerFlags *flags)
|
|
{
|
|
PyObject *ret = NULL;
|
|
mod_ty mod;
|
|
PyArena *arena = PyArena_New();
|
|
if (arena == NULL)
|
|
return NULL;
|
|
|
|
mod = PyParser_ASTFromString(str, "<string>", start, flags, arena);
|
|
if (mod != NULL)
|
|
ret = run_mod(mod, "<string>", globals, locals, flags, arena);
|
|
PyArena_Free(arena);
|
|
return ret;
|
|
}
|
|
|
|
PyObject *
|
|
PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals,
|
|
PyObject *locals, int closeit, PyCompilerFlags *flags)
|
|
{
|
|
PyObject *ret;
|
|
mod_ty mod;
|
|
PyArena *arena = PyArena_New();
|
|
if (arena == NULL)
|
|
return NULL;
|
|
|
|
mod = PyParser_ASTFromFile(fp, filename, start, 0, 0,
|
|
flags, NULL, arena);
|
|
if (mod == NULL) {
|
|
PyArena_Free(arena);
|
|
return NULL;
|
|
}
|
|
if (closeit)
|
|
fclose(fp);
|
|
ret = run_mod(mod, filename, globals, locals, flags, arena);
|
|
PyArena_Free(arena);
|
|
return ret;
|
|
}
|
|
|
|
static PyObject *
|
|
run_mod(mod_ty mod, const char *filename, PyObject *globals, PyObject *locals,
|
|
PyCompilerFlags *flags, PyArena *arena)
|
|
{
|
|
PyCodeObject *co;
|
|
PyObject *v;
|
|
co = PyAST_Compile(mod, filename, flags, arena);
|
|
if (co == NULL)
|
|
return NULL;
|
|
v = PyEval_EvalCode(co, globals, locals);
|
|
Py_DECREF(co);
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
|
|
PyObject *locals, PyCompilerFlags *flags)
|
|
{
|
|
PyCodeObject *co;
|
|
PyObject *v;
|
|
long magic;
|
|
long PyImport_GetMagicNumber(void);
|
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
|
if (magic != PyImport_GetMagicNumber()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"Bad magic number in .pyc file");
|
|
return NULL;
|
|
}
|
|
(void) PyMarshal_ReadLongFromFile(fp);
|
|
v = PyMarshal_ReadLastObjectFromFile(fp);
|
|
fclose(fp);
|
|
if (v == NULL || !PyCode_Check(v)) {
|
|
Py_XDECREF(v);
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"Bad code object in .pyc file");
|
|
return NULL;
|
|
}
|
|
co = (PyCodeObject *)v;
|
|
v = PyEval_EvalCode(co, globals, locals);
|
|
if (v && flags)
|
|
flags->cf_flags |= (co->co_flags & PyCF_MASK);
|
|
Py_DECREF(co);
|
|
return v;
|
|
}
|
|
|
|
PyObject *
|
|
Py_CompileStringFlags(const char *str, const char *filename, int start,
|
|
PyCompilerFlags *flags)
|
|
{
|
|
PyCodeObject *co;
|
|
mod_ty mod;
|
|
PyArena *arena = PyArena_New();
|
|
if (arena == NULL)
|
|
return NULL;
|
|
|
|
mod = PyParser_ASTFromString(str, filename, start, flags, arena);
|
|
if (mod == NULL) {
|
|
PyArena_Free(arena);
|
|
return NULL;
|
|
}
|
|
if (flags && (flags->cf_flags & PyCF_ONLY_AST)) {
|
|
PyObject *result = PyAST_mod2obj(mod);
|
|
PyArena_Free(arena);
|
|
return result;
|
|
}
|
|
co = PyAST_Compile(mod, filename, flags, arena);
|
|
PyArena_Free(arena);
|
|
return (PyObject *)co;
|
|
}
|
|
|
|
struct symtable *
|
|
Py_SymtableString(const char *str, const char *filename, int start)
|
|
{
|
|
struct symtable *st;
|
|
mod_ty mod;
|
|
PyArena *arena = PyArena_New();
|
|
if (arena == NULL)
|
|
return NULL;
|
|
|
|
mod = PyParser_ASTFromString(str, filename, start, NULL, arena);
|
|
if (mod == NULL) {
|
|
PyArena_Free(arena);
|
|
return NULL;
|
|
}
|
|
st = PySymtable_Build(mod, filename, 0);
|
|
PyArena_Free(arena);
|
|
return st;
|
|
}
|
|
|
|
/* Preferred access to parser is through AST. */
|
|
mod_ty
|
|
PyParser_ASTFromString(const char *s, const char *filename, int start,
|
|
PyCompilerFlags *flags, PyArena *arena)
|
|
{
|
|
mod_ty mod;
|
|
perrdetail err;
|
|
node *n = PyParser_ParseStringFlagsFilename(s, filename,
|
|
&_PyParser_Grammar, start, &err,
|
|
PARSER_FLAGS(flags));
|
|
if (n) {
|
|
mod = PyAST_FromNode(n, flags, filename, arena);
|
|
PyNode_Free(n);
|
|
return mod;
|
|
}
|
|
else {
|
|
err_input(&err);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
mod_ty
|
|
PyParser_ASTFromFile(FILE *fp, const char *filename, int start, char *ps1,
|
|
char *ps2, PyCompilerFlags *flags, int *errcode,
|
|
PyArena *arena)
|
|
{
|
|
mod_ty mod;
|
|
perrdetail err;
|
|
node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
|
|
start, ps1, ps2, &err, PARSER_FLAGS(flags));
|
|
if (n) {
|
|
mod = PyAST_FromNode(n, flags, filename, arena);
|
|
PyNode_Free(n);
|
|
return mod;
|
|
}
|
|
else {
|
|
err_input(&err);
|
|
if (errcode)
|
|
*errcode = err.error;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* Simplified interface to parsefile -- return node or set exception */
|
|
|
|
node *
|
|
PyParser_SimpleParseFileFlags(FILE *fp, const char *filename, int start, int flags)
|
|
{
|
|
perrdetail err;
|
|
node *n = PyParser_ParseFileFlags(fp, filename, &_PyParser_Grammar,
|
|
start, NULL, NULL, &err, flags);
|
|
if (n == NULL)
|
|
err_input(&err);
|
|
|
|
return n;
|
|
}
|
|
|
|
/* Simplified interface to parsestring -- return node or set exception */
|
|
|
|
node *
|
|
PyParser_SimpleParseStringFlags(const char *str, int start, int flags)
|
|
{
|
|
perrdetail err;
|
|
node *n = PyParser_ParseStringFlags(str, &_PyParser_Grammar,
|
|
start, &err, flags);
|
|
if (n == NULL)
|
|
err_input(&err);
|
|
return n;
|
|
}
|
|
|
|
node *
|
|
PyParser_SimpleParseStringFlagsFilename(const char *str, const char *filename,
|
|
int start, int flags)
|
|
{
|
|
perrdetail err;
|
|
node *n = PyParser_ParseStringFlagsFilename(str, filename,
|
|
&_PyParser_Grammar, start, &err, flags);
|
|
if (n == NULL)
|
|
err_input(&err);
|
|
return n;
|
|
}
|
|
|
|
node *
|
|
PyParser_SimpleParseStringFilename(const char *str, const char *filename, int start)
|
|
{
|
|
return PyParser_SimpleParseStringFlagsFilename(str, filename, start, 0);
|
|
}
|
|
|
|
/* May want to move a more generalized form of this to parsetok.c or
|
|
even parser modules. */
|
|
|
|
void
|
|
PyParser_SetError(perrdetail *err)
|
|
{
|
|
err_input(err);
|
|
}
|
|
|
|
/* Set the error appropriate to the given input error code (see errcode.h) */
|
|
|
|
static void
|
|
err_input(perrdetail *err)
|
|
{
|
|
PyObject *v, *w, *errtype;
|
|
PyObject* u = NULL;
|
|
char *msg = NULL;
|
|
errtype = PyExc_SyntaxError;
|
|
switch (err->error) {
|
|
case E_SYNTAX:
|
|
errtype = PyExc_IndentationError;
|
|
if (err->expected == INDENT)
|
|
msg = "expected an indented block";
|
|
else if (err->token == INDENT)
|
|
msg = "unexpected indent";
|
|
else if (err->token == DEDENT)
|
|
msg = "unexpected unindent";
|
|
else {
|
|
errtype = PyExc_SyntaxError;
|
|
msg = "invalid syntax";
|
|
}
|
|
break;
|
|
case E_TOKEN:
|
|
msg = "invalid token";
|
|
break;
|
|
case E_EOFS:
|
|
msg = "EOF while scanning triple-quoted string";
|
|
break;
|
|
case E_EOLS:
|
|
msg = "EOL while scanning single-quoted string";
|
|
break;
|
|
case E_INTR:
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetNone(PyExc_KeyboardInterrupt);
|
|
return;
|
|
case E_NOMEM:
|
|
PyErr_NoMemory();
|
|
return;
|
|
case E_EOF:
|
|
msg = "unexpected EOF while parsing";
|
|
break;
|
|
case E_TABSPACE:
|
|
errtype = PyExc_TabError;
|
|
msg = "inconsistent use of tabs and spaces in indentation";
|
|
break;
|
|
case E_OVERFLOW:
|
|
msg = "expression too long";
|
|
break;
|
|
case E_DEDENT:
|
|
errtype = PyExc_IndentationError;
|
|
msg = "unindent does not match any outer indentation level";
|
|
break;
|
|
case E_TOODEEP:
|
|
errtype = PyExc_IndentationError;
|
|
msg = "too many levels of indentation";
|
|
break;
|
|
case E_DECODE: {
|
|
PyObject *type, *value, *tb;
|
|
PyErr_Fetch(&type, &value, &tb);
|
|
if (value != NULL) {
|
|
u = PyObject_Str(value);
|
|
if (u != NULL) {
|
|
msg = PyString_AsString(u);
|
|
}
|
|
}
|
|
if (msg == NULL)
|
|
msg = "unknown decode error";
|
|
Py_XDECREF(type);
|
|
Py_XDECREF(value);
|
|
Py_XDECREF(tb);
|
|
break;
|
|
}
|
|
case E_LINECONT:
|
|
msg = "unexpected character after line continuation character";
|
|
break;
|
|
default:
|
|
fprintf(stderr, "error=%d\n", err->error);
|
|
msg = "unknown parsing error";
|
|
break;
|
|
}
|
|
v = Py_BuildValue("(ziiz)", err->filename,
|
|
err->lineno, err->offset, err->text);
|
|
if (err->text != NULL) {
|
|
PyObject_FREE(err->text);
|
|
err->text = NULL;
|
|
}
|
|
w = NULL;
|
|
if (v != NULL)
|
|
w = Py_BuildValue("(sO)", msg, v);
|
|
Py_XDECREF(u);
|
|
Py_XDECREF(v);
|
|
PyErr_SetObject(errtype, w);
|
|
Py_XDECREF(w);
|
|
}
|
|
|
|
/* Print fatal error message and abort */
|
|
|
|
void
|
|
Py_FatalError(const char *msg)
|
|
{
|
|
fprintf(stderr, "Fatal Python error: %s\n", msg);
|
|
#ifdef MS_WINDOWS
|
|
OutputDebugString("Fatal Python error: ");
|
|
OutputDebugString(msg);
|
|
OutputDebugString("\n");
|
|
#ifdef _DEBUG
|
|
DebugBreak();
|
|
#endif
|
|
#endif /* MS_WINDOWS */
|
|
abort();
|
|
}
|
|
|
|
/* Clean up and exit */
|
|
|
|
#ifdef WITH_THREAD
|
|
#include "pythread.h"
|
|
#endif
|
|
|
|
#define NEXITFUNCS 32
|
|
static void (*exitfuncs[NEXITFUNCS])(void);
|
|
static int nexitfuncs = 0;
|
|
|
|
int Py_AtExit(void (*func)(void))
|
|
{
|
|
if (nexitfuncs >= NEXITFUNCS)
|
|
return -1;
|
|
exitfuncs[nexitfuncs++] = func;
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
call_sys_exitfunc(void)
|
|
{
|
|
PyObject *exitfunc = PySys_GetObject("exitfunc");
|
|
|
|
if (exitfunc) {
|
|
PyObject *res;
|
|
Py_INCREF(exitfunc);
|
|
PySys_SetObject("exitfunc", (PyObject *)NULL);
|
|
res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
|
|
if (res == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
|
|
PySys_WriteStderr("Error in sys.exitfunc:\n");
|
|
}
|
|
PyErr_Print();
|
|
}
|
|
Py_DECREF(exitfunc);
|
|
}
|
|
|
|
if (Py_FlushLine())
|
|
PyErr_Clear();
|
|
}
|
|
|
|
static void
|
|
call_ll_exitfuncs(void)
|
|
{
|
|
while (nexitfuncs > 0)
|
|
(*exitfuncs[--nexitfuncs])();
|
|
|
|
fflush(stdout);
|
|
fflush(stderr);
|
|
}
|
|
|
|
void
|
|
Py_Exit(int sts)
|
|
{
|
|
Py_Finalize();
|
|
|
|
exit(sts);
|
|
}
|
|
|
|
static void
|
|
initsigs(void)
|
|
{
|
|
#ifdef SIGPIPE
|
|
PyOS_setsig(SIGPIPE, SIG_IGN);
|
|
#endif
|
|
#ifdef SIGXFZ
|
|
PyOS_setsig(SIGXFZ, SIG_IGN);
|
|
#endif
|
|
#ifdef SIGXFSZ
|
|
PyOS_setsig(SIGXFSZ, SIG_IGN);
|
|
#endif
|
|
PyOS_InitInterrupts(); /* May imply initsignal() */
|
|
}
|
|
|
|
|
|
/*
|
|
* The file descriptor fd is considered ``interactive'' if either
|
|
* a) isatty(fd) is TRUE, or
|
|
* b) the -i flag was given, and the filename associated with
|
|
* the descriptor is NULL or "<stdin>" or "???".
|
|
*/
|
|
int
|
|
Py_FdIsInteractive(FILE *fp, const char *filename)
|
|
{
|
|
if (isatty((int)fileno(fp)))
|
|
return 1;
|
|
if (!Py_InteractiveFlag)
|
|
return 0;
|
|
return (filename == NULL) ||
|
|
(strcmp(filename, "<stdin>") == 0) ||
|
|
(strcmp(filename, "???") == 0);
|
|
}
|
|
|
|
|
|
#if defined(USE_STACKCHECK)
|
|
#if defined(WIN32) && defined(_MSC_VER)
|
|
|
|
/* Stack checking for Microsoft C */
|
|
|
|
#include <malloc.h>
|
|
#include <excpt.h>
|
|
|
|
/*
|
|
* Return non-zero when we run out of memory on the stack; zero otherwise.
|
|
*/
|
|
int
|
|
PyOS_CheckStack(void)
|
|
{
|
|
__try {
|
|
/* alloca throws a stack overflow exception if there's
|
|
not enough space left on the stack */
|
|
alloca(PYOS_STACK_MARGIN * sizeof(void*));
|
|
return 0;
|
|
} __except (EXCEPTION_EXECUTE_HANDLER) {
|
|
/* just ignore all errors */
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
#endif /* WIN32 && _MSC_VER */
|
|
|
|
/* Alternate implementations can be added here... */
|
|
|
|
#endif /* USE_STACKCHECK */
|
|
|
|
|
|
/* Wrappers around sigaction() or signal(). */
|
|
|
|
PyOS_sighandler_t
|
|
PyOS_getsig(int sig)
|
|
{
|
|
#ifdef HAVE_SIGACTION
|
|
struct sigaction context;
|
|
if (sigaction(sig, NULL, &context) == -1)
|
|
return SIG_ERR;
|
|
return context.sa_handler;
|
|
#else
|
|
PyOS_sighandler_t handler;
|
|
/* Special signal handling for the secure CRT in Visual Studio 2005 */
|
|
#if defined(_MSC_VER) && _MSC_VER >= 1400
|
|
switch (sig) {
|
|
/* Only these signals are valid */
|
|
case SIGINT:
|
|
case SIGILL:
|
|
case SIGFPE:
|
|
case SIGSEGV:
|
|
case SIGTERM:
|
|
case SIGBREAK:
|
|
case SIGABRT:
|
|
break;
|
|
/* Don't call signal() with other values or it will assert */
|
|
default:
|
|
return SIG_ERR;
|
|
}
|
|
#endif /* _MSC_VER && _MSC_VER >= 1400 */
|
|
handler = signal(sig, SIG_IGN);
|
|
if (handler != SIG_ERR)
|
|
signal(sig, handler);
|
|
return handler;
|
|
#endif
|
|
}
|
|
|
|
PyOS_sighandler_t
|
|
PyOS_setsig(int sig, PyOS_sighandler_t handler)
|
|
{
|
|
#ifdef HAVE_SIGACTION
|
|
struct sigaction context, ocontext;
|
|
context.sa_handler = handler;
|
|
sigemptyset(&context.sa_mask);
|
|
context.sa_flags = 0;
|
|
if (sigaction(sig, &context, &ocontext) == -1)
|
|
return SIG_ERR;
|
|
return ocontext.sa_handler;
|
|
#else
|
|
PyOS_sighandler_t oldhandler;
|
|
oldhandler = signal(sig, handler);
|
|
#ifdef HAVE_SIGINTERRUPT
|
|
siginterrupt(sig, 1);
|
|
#endif
|
|
return oldhandler;
|
|
#endif
|
|
}
|
|
|
|
/* Deprecated C API functions still provided for binary compatiblity */
|
|
|
|
#undef PyParser_SimpleParseFile
|
|
PyAPI_FUNC(node *)
|
|
PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
|
|
{
|
|
return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
|
|
}
|
|
|
|
#undef PyParser_SimpleParseString
|
|
PyAPI_FUNC(node *)
|
|
PyParser_SimpleParseString(const char *str, int start)
|
|
{
|
|
return PyParser_SimpleParseStringFlags(str, start, 0);
|
|
}
|
|
|
|
#undef PyRun_AnyFile
|
|
PyAPI_FUNC(int)
|
|
PyRun_AnyFile(FILE *fp, const char *name)
|
|
{
|
|
return PyRun_AnyFileExFlags(fp, name, 0, NULL);
|
|
}
|
|
|
|
#undef PyRun_AnyFileEx
|
|
PyAPI_FUNC(int)
|
|
PyRun_AnyFileEx(FILE *fp, const char *name, int closeit)
|
|
{
|
|
return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
|
|
}
|
|
|
|
#undef PyRun_AnyFileFlags
|
|
PyAPI_FUNC(int)
|
|
PyRun_AnyFileFlags(FILE *fp, const char *name, PyCompilerFlags *flags)
|
|
{
|
|
return PyRun_AnyFileExFlags(fp, name, 0, flags);
|
|
}
|
|
|
|
#undef PyRun_File
|
|
PyAPI_FUNC(PyObject *)
|
|
PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l)
|
|
{
|
|
return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
|
|
}
|
|
|
|
#undef PyRun_FileEx
|
|
PyAPI_FUNC(PyObject *)
|
|
PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c)
|
|
{
|
|
return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
|
|
}
|
|
|
|
#undef PyRun_FileFlags
|
|
PyAPI_FUNC(PyObject *)
|
|
PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
|
|
PyCompilerFlags *flags)
|
|
{
|
|
return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
|
|
}
|
|
|
|
#undef PyRun_SimpleFile
|
|
PyAPI_FUNC(int)
|
|
PyRun_SimpleFile(FILE *f, const char *p)
|
|
{
|
|
return PyRun_SimpleFileExFlags(f, p, 0, NULL);
|
|
}
|
|
|
|
#undef PyRun_SimpleFileEx
|
|
PyAPI_FUNC(int)
|
|
PyRun_SimpleFileEx(FILE *f, const char *p, int c)
|
|
{
|
|
return PyRun_SimpleFileExFlags(f, p, c, NULL);
|
|
}
|
|
|
|
|
|
#undef PyRun_String
|
|
PyAPI_FUNC(PyObject *)
|
|
PyRun_String(const char *str, int s, PyObject *g, PyObject *l)
|
|
{
|
|
return PyRun_StringFlags(str, s, g, l, NULL);
|
|
}
|
|
|
|
#undef PyRun_SimpleString
|
|
PyAPI_FUNC(int)
|
|
PyRun_SimpleString(const char *s)
|
|
{
|
|
return PyRun_SimpleStringFlags(s, NULL);
|
|
}
|
|
|
|
#undef Py_CompileString
|
|
PyAPI_FUNC(PyObject *)
|
|
Py_CompileString(const char *str, const char *p, int s)
|
|
{
|
|
return Py_CompileStringFlags(str, p, s, NULL);
|
|
}
|
|
|
|
#undef PyRun_InteractiveOne
|
|
PyAPI_FUNC(int)
|
|
PyRun_InteractiveOne(FILE *f, const char *p)
|
|
{
|
|
return PyRun_InteractiveOneFlags(f, p, NULL);
|
|
}
|
|
|
|
#undef PyRun_InteractiveLoop
|
|
PyAPI_FUNC(int)
|
|
PyRun_InteractiveLoop(FILE *f, const char *p)
|
|
{
|
|
return PyRun_InteractiveLoopFlags(f, p, NULL);
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|