mirror of
https://github.com/python/cpython.git
synced 2025-07-12 05:45:15 +00:00

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. ........
827 lines
19 KiB
C
827 lines
19 KiB
C
|
|
/* Error handling */
|
|
|
|
#include "Python.h"
|
|
|
|
#ifndef __STDC__
|
|
#ifndef MS_WINDOWS
|
|
extern char *strerror(int);
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef MS_WINDOWS
|
|
#include "windows.h"
|
|
#include "winbase.h"
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
|
|
void
|
|
PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback)
|
|
{
|
|
PyThreadState *tstate = PyThreadState_GET();
|
|
PyObject *oldtype, *oldvalue, *oldtraceback;
|
|
|
|
if (traceback != NULL && !PyTraceBack_Check(traceback)) {
|
|
/* XXX Should never happen -- fatal error instead? */
|
|
/* Well, it could be None. */
|
|
Py_DECREF(traceback);
|
|
traceback = NULL;
|
|
}
|
|
|
|
/* Save these in locals to safeguard against recursive
|
|
invocation through Py_XDECREF */
|
|
oldtype = tstate->curexc_type;
|
|
oldvalue = tstate->curexc_value;
|
|
oldtraceback = tstate->curexc_traceback;
|
|
|
|
tstate->curexc_type = type;
|
|
tstate->curexc_value = value;
|
|
tstate->curexc_traceback = traceback;
|
|
|
|
Py_XDECREF(oldtype);
|
|
Py_XDECREF(oldvalue);
|
|
Py_XDECREF(oldtraceback);
|
|
}
|
|
|
|
void
|
|
PyErr_SetObject(PyObject *exception, PyObject *value)
|
|
{
|
|
if (exception != NULL &&
|
|
!PyExceptionClass_Check(exception)) {
|
|
PyObject *excstr = PyObject_Repr(exception);
|
|
PyErr_Format(PyExc_SystemError,
|
|
"exception %s not a BaseException subclass",
|
|
PyString_AS_STRING(excstr));
|
|
Py_DECREF(excstr);
|
|
return;
|
|
}
|
|
Py_XINCREF(exception);
|
|
Py_XINCREF(value);
|
|
PyErr_Restore(exception, value, (PyObject *)NULL);
|
|
}
|
|
|
|
void
|
|
PyErr_SetNone(PyObject *exception)
|
|
{
|
|
PyErr_SetObject(exception, (PyObject *)NULL);
|
|
}
|
|
|
|
void
|
|
PyErr_SetString(PyObject *exception, const char *string)
|
|
{
|
|
PyObject *value = PyString_FromString(string);
|
|
PyErr_SetObject(exception, value);
|
|
Py_XDECREF(value);
|
|
}
|
|
|
|
|
|
PyObject *
|
|
PyErr_Occurred(void)
|
|
{
|
|
PyThreadState *tstate = PyThreadState_GET();
|
|
|
|
return tstate->curexc_type;
|
|
}
|
|
|
|
|
|
int
|
|
PyErr_GivenExceptionMatches(PyObject *err, PyObject *exc)
|
|
{
|
|
if (err == NULL || exc == NULL) {
|
|
/* maybe caused by "import exceptions" that failed early on */
|
|
return 0;
|
|
}
|
|
if (PyTuple_Check(exc)) {
|
|
Py_ssize_t i, n;
|
|
n = PyTuple_Size(exc);
|
|
for (i = 0; i < n; i++) {
|
|
/* Test recursively */
|
|
if (PyErr_GivenExceptionMatches(
|
|
err, PyTuple_GET_ITEM(exc, i)))
|
|
{
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
/* err might be an instance, so check its class. */
|
|
if (PyExceptionInstance_Check(err))
|
|
err = PyExceptionInstance_Class(err);
|
|
|
|
if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) {
|
|
/* problems here!? not sure PyObject_IsSubclass expects to
|
|
be called with an exception pending... */
|
|
return PyObject_IsSubclass(err, exc);
|
|
}
|
|
|
|
return err == exc;
|
|
}
|
|
|
|
|
|
int
|
|
PyErr_ExceptionMatches(PyObject *exc)
|
|
{
|
|
return PyErr_GivenExceptionMatches(PyErr_Occurred(), exc);
|
|
}
|
|
|
|
|
|
/* Used in many places to normalize a raised exception, including in
|
|
eval_code2(), do_raise(), and PyErr_Print()
|
|
*/
|
|
void
|
|
PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
|
|
{
|
|
PyObject *type = *exc;
|
|
PyObject *value = *val;
|
|
PyObject *inclass = NULL;
|
|
PyObject *initial_tb = NULL;
|
|
|
|
if (type == NULL) {
|
|
/* There was no exception, so nothing to do. */
|
|
return;
|
|
}
|
|
|
|
/* If PyErr_SetNone() was used, the value will have been actually
|
|
set to NULL.
|
|
*/
|
|
if (!value) {
|
|
value = Py_None;
|
|
Py_INCREF(value);
|
|
}
|
|
|
|
if (PyExceptionInstance_Check(value))
|
|
inclass = PyExceptionInstance_Class(value);
|
|
|
|
/* Normalize the exception so that if the type is a class, the
|
|
value will be an instance.
|
|
*/
|
|
if (PyExceptionClass_Check(type)) {
|
|
/* if the value was not an instance, or is not an instance
|
|
whose class is (or is derived from) type, then use the
|
|
value as an argument to instantiation of the type
|
|
class.
|
|
*/
|
|
if (!inclass || !PyObject_IsSubclass(inclass, type)) {
|
|
PyObject *args, *res;
|
|
|
|
if (value == Py_None)
|
|
args = PyTuple_New(0);
|
|
else if (PyTuple_Check(value)) {
|
|
Py_INCREF(value);
|
|
args = value;
|
|
}
|
|
else
|
|
args = PyTuple_Pack(1, value);
|
|
|
|
if (args == NULL)
|
|
goto finally;
|
|
res = PyEval_CallObject(type, args);
|
|
Py_DECREF(args);
|
|
if (res == NULL)
|
|
goto finally;
|
|
Py_DECREF(value);
|
|
value = res;
|
|
}
|
|
/* if the class of the instance doesn't exactly match the
|
|
class of the type, believe the instance
|
|
*/
|
|
else if (inclass != type) {
|
|
Py_DECREF(type);
|
|
type = inclass;
|
|
Py_INCREF(type);
|
|
}
|
|
}
|
|
*exc = type;
|
|
*val = value;
|
|
return;
|
|
finally:
|
|
Py_DECREF(type);
|
|
Py_DECREF(value);
|
|
/* If the new exception doesn't set a traceback and the old
|
|
exception had a traceback, use the old traceback for the
|
|
new exception. It's better than nothing.
|
|
*/
|
|
initial_tb = *tb;
|
|
PyErr_Fetch(exc, val, tb);
|
|
if (initial_tb != NULL) {
|
|
if (*tb == NULL)
|
|
*tb = initial_tb;
|
|
else
|
|
Py_DECREF(initial_tb);
|
|
}
|
|
/* normalize recursively */
|
|
PyErr_NormalizeException(exc, val, tb);
|
|
}
|
|
|
|
|
|
void
|
|
PyErr_Fetch(PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
|
|
{
|
|
PyThreadState *tstate = PyThreadState_GET();
|
|
|
|
*p_type = tstate->curexc_type;
|
|
*p_value = tstate->curexc_value;
|
|
*p_traceback = tstate->curexc_traceback;
|
|
|
|
tstate->curexc_type = NULL;
|
|
tstate->curexc_value = NULL;
|
|
tstate->curexc_traceback = NULL;
|
|
}
|
|
|
|
void
|
|
PyErr_Clear(void)
|
|
{
|
|
PyErr_Restore(NULL, NULL, NULL);
|
|
}
|
|
|
|
/* Convenience functions to set a type error exception and return 0 */
|
|
|
|
int
|
|
PyErr_BadArgument(void)
|
|
{
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"bad argument type for built-in operation");
|
|
return 0;
|
|
}
|
|
|
|
PyObject *
|
|
PyErr_NoMemory(void)
|
|
{
|
|
if (PyErr_ExceptionMatches(PyExc_MemoryError))
|
|
/* already current */
|
|
return NULL;
|
|
|
|
/* raise the pre-allocated instance if it still exists */
|
|
if (PyExc_MemoryErrorInst)
|
|
PyErr_SetObject(PyExc_MemoryError, PyExc_MemoryErrorInst);
|
|
else
|
|
/* this will probably fail since there's no memory and hee,
|
|
hee, we have to instantiate this class
|
|
*/
|
|
PyErr_SetNone(PyExc_MemoryError);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
PyObject *
|
|
PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
|
|
{
|
|
PyObject *v;
|
|
char *s;
|
|
int i = errno;
|
|
#ifdef PLAN9
|
|
char errbuf[ERRMAX];
|
|
#endif
|
|
#ifdef MS_WINDOWS
|
|
char *s_buf = NULL;
|
|
char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */
|
|
#endif
|
|
#ifdef EINTR
|
|
if (i == EINTR && PyErr_CheckSignals())
|
|
return NULL;
|
|
#endif
|
|
#ifdef PLAN9
|
|
rerrstr(errbuf, sizeof errbuf);
|
|
s = errbuf;
|
|
#else
|
|
if (i == 0)
|
|
s = "Error"; /* Sometimes errno didn't get set */
|
|
else
|
|
#ifndef MS_WINDOWS
|
|
s = strerror(i);
|
|
#else
|
|
{
|
|
/* Note that the Win32 errors do not lineup with the
|
|
errno error. So if the error is in the MSVC error
|
|
table, we use it, otherwise we assume it really _is_
|
|
a Win32 error code
|
|
*/
|
|
if (i > 0 && i < _sys_nerr) {
|
|
s = _sys_errlist[i];
|
|
}
|
|
else {
|
|
int len = FormatMessage(
|
|
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
|
FORMAT_MESSAGE_FROM_SYSTEM |
|
|
FORMAT_MESSAGE_IGNORE_INSERTS,
|
|
NULL, /* no message source */
|
|
i,
|
|
MAKELANGID(LANG_NEUTRAL,
|
|
SUBLANG_DEFAULT),
|
|
/* Default language */
|
|
(LPTSTR) &s_buf,
|
|
0, /* size not used */
|
|
NULL); /* no args */
|
|
if (len==0) {
|
|
/* Only ever seen this in out-of-mem
|
|
situations */
|
|
sprintf(s_small_buf, "Windows Error 0x%X", i);
|
|
s = s_small_buf;
|
|
s_buf = NULL;
|
|
} else {
|
|
s = s_buf;
|
|
/* remove trailing cr/lf and dots */
|
|
while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
|
|
s[--len] = '\0';
|
|
}
|
|
}
|
|
}
|
|
#endif /* Unix/Windows */
|
|
#endif /* PLAN 9*/
|
|
if (filenameObject != NULL)
|
|
v = Py_BuildValue("(isO)", i, s, filenameObject);
|
|
else
|
|
v = Py_BuildValue("(is)", i, s);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(exc, v);
|
|
Py_DECREF(v);
|
|
}
|
|
#ifdef MS_WINDOWS
|
|
LocalFree(s_buf);
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
|
|
PyObject *
|
|
PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename)
|
|
{
|
|
PyObject *name = filename ? PyString_FromString(filename) : NULL;
|
|
PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
|
|
Py_XDECREF(name);
|
|
return result;
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyObject *
|
|
PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, Py_UNICODE *filename)
|
|
{
|
|
PyObject *name = filename ?
|
|
PyUnicode_FromUnicode(filename, wcslen(filename)) :
|
|
NULL;
|
|
PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
|
|
Py_XDECREF(name);
|
|
return result;
|
|
}
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
|
|
PyObject *
|
|
PyErr_SetFromErrno(PyObject *exc)
|
|
{
|
|
return PyErr_SetFromErrnoWithFilenameObject(exc, NULL);
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
/* Windows specific error code handling */
|
|
PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject(
|
|
PyObject *exc,
|
|
int ierr,
|
|
PyObject *filenameObject)
|
|
{
|
|
int len;
|
|
char *s;
|
|
char *s_buf = NULL; /* Free via LocalFree */
|
|
char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */
|
|
PyObject *v;
|
|
DWORD err = (DWORD)ierr;
|
|
if (err==0) err = GetLastError();
|
|
len = FormatMessage(
|
|
/* Error API error */
|
|
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
|
FORMAT_MESSAGE_FROM_SYSTEM |
|
|
FORMAT_MESSAGE_IGNORE_INSERTS,
|
|
NULL, /* no message source */
|
|
err,
|
|
MAKELANGID(LANG_NEUTRAL,
|
|
SUBLANG_DEFAULT), /* Default language */
|
|
(LPTSTR) &s_buf,
|
|
0, /* size not used */
|
|
NULL); /* no args */
|
|
if (len==0) {
|
|
/* Only seen this in out of mem situations */
|
|
sprintf(s_small_buf, "Windows Error 0x%X", err);
|
|
s = s_small_buf;
|
|
s_buf = NULL;
|
|
} else {
|
|
s = s_buf;
|
|
/* remove trailing cr/lf and dots */
|
|
while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
|
|
s[--len] = '\0';
|
|
}
|
|
if (filenameObject != NULL)
|
|
v = Py_BuildValue("(isO)", err, s, filenameObject);
|
|
else
|
|
v = Py_BuildValue("(is)", err, s);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(exc, v);
|
|
Py_DECREF(v);
|
|
}
|
|
LocalFree(s_buf);
|
|
return NULL;
|
|
}
|
|
|
|
PyObject *PyErr_SetExcFromWindowsErrWithFilename(
|
|
PyObject *exc,
|
|
int ierr,
|
|
const char *filename)
|
|
{
|
|
PyObject *name = filename ? PyString_FromString(filename) : NULL;
|
|
PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
|
|
ierr,
|
|
name);
|
|
Py_XDECREF(name);
|
|
return ret;
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename(
|
|
PyObject *exc,
|
|
int ierr,
|
|
const Py_UNICODE *filename)
|
|
{
|
|
PyObject *name = filename ?
|
|
PyUnicode_FromUnicode(filename, wcslen(filename)) :
|
|
NULL;
|
|
PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
|
|
ierr,
|
|
name);
|
|
Py_XDECREF(name);
|
|
return ret;
|
|
}
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
|
|
PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr)
|
|
{
|
|
return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL);
|
|
}
|
|
|
|
PyObject *PyErr_SetFromWindowsErr(int ierr)
|
|
{
|
|
return PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError,
|
|
ierr, NULL);
|
|
}
|
|
PyObject *PyErr_SetFromWindowsErrWithFilename(
|
|
int ierr,
|
|
const char *filename)
|
|
{
|
|
PyObject *name = filename ? PyString_FromString(filename) : NULL;
|
|
PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
|
|
PyExc_WindowsError,
|
|
ierr, name);
|
|
Py_XDECREF(name);
|
|
return result;
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename(
|
|
int ierr,
|
|
const Py_UNICODE *filename)
|
|
{
|
|
PyObject *name = filename ?
|
|
PyUnicode_FromUnicode(filename, wcslen(filename)) :
|
|
NULL;
|
|
PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
|
|
PyExc_WindowsError,
|
|
ierr, name);
|
|
Py_XDECREF(name);
|
|
return result;
|
|
}
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
#endif /* MS_WINDOWS */
|
|
|
|
void
|
|
_PyErr_BadInternalCall(char *filename, int lineno)
|
|
{
|
|
PyErr_Format(PyExc_SystemError,
|
|
"%s:%d: bad argument to internal function",
|
|
filename, lineno);
|
|
}
|
|
|
|
/* Remove the preprocessor macro for PyErr_BadInternalCall() so that we can
|
|
export the entry point for existing object code: */
|
|
#undef PyErr_BadInternalCall
|
|
void
|
|
PyErr_BadInternalCall(void)
|
|
{
|
|
PyErr_Format(PyExc_SystemError,
|
|
"bad argument to internal function");
|
|
}
|
|
#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
|
|
|
|
|
|
|
|
PyObject *
|
|
PyErr_Format(PyObject *exception, const char *format, ...)
|
|
{
|
|
va_list vargs;
|
|
PyObject* string;
|
|
|
|
#ifdef HAVE_STDARG_PROTOTYPES
|
|
va_start(vargs, format);
|
|
#else
|
|
va_start(vargs);
|
|
#endif
|
|
|
|
string = PyString_FromFormatV(format, vargs);
|
|
PyErr_SetObject(exception, string);
|
|
Py_XDECREF(string);
|
|
va_end(vargs);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
PyErr_NewException(char *name, PyObject *base, PyObject *dict)
|
|
{
|
|
char *dot;
|
|
PyObject *modulename = NULL;
|
|
PyObject *classname = NULL;
|
|
PyObject *mydict = NULL;
|
|
PyObject *bases = NULL;
|
|
PyObject *result = NULL;
|
|
dot = strrchr(name, '.');
|
|
if (dot == NULL) {
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"PyErr_NewException: name must be module.class");
|
|
return NULL;
|
|
}
|
|
if (base == NULL)
|
|
base = PyExc_Exception;
|
|
if (dict == NULL) {
|
|
dict = mydict = PyDict_New();
|
|
if (dict == NULL)
|
|
goto failure;
|
|
}
|
|
if (PyDict_GetItemString(dict, "__module__") == NULL) {
|
|
modulename = PyString_FromStringAndSize(name,
|
|
(Py_ssize_t)(dot-name));
|
|
if (modulename == NULL)
|
|
goto failure;
|
|
if (PyDict_SetItemString(dict, "__module__", modulename) != 0)
|
|
goto failure;
|
|
}
|
|
if (PyTuple_Check(base)) {
|
|
bases = base;
|
|
/* INCREF as we create a new ref in the else branch */
|
|
Py_INCREF(bases);
|
|
} else {
|
|
bases = PyTuple_Pack(1, base);
|
|
if (bases == NULL)
|
|
goto failure;
|
|
}
|
|
/* Create a real new-style class. */
|
|
result = PyObject_CallFunction((PyObject *)&PyType_Type, "sOO",
|
|
dot+1, bases, dict);
|
|
failure:
|
|
Py_XDECREF(bases);
|
|
Py_XDECREF(mydict);
|
|
Py_XDECREF(classname);
|
|
Py_XDECREF(modulename);
|
|
return result;
|
|
}
|
|
|
|
/* Call when an exception has occurred but there is no way for Python
|
|
to handle it. Examples: exception in __del__ or during GC. */
|
|
void
|
|
PyErr_WriteUnraisable(PyObject *obj)
|
|
{
|
|
PyObject *f, *t, *v, *tb;
|
|
PyErr_Fetch(&t, &v, &tb);
|
|
f = PySys_GetObject("stderr");
|
|
if (f != NULL) {
|
|
PyFile_WriteString("Exception ", f);
|
|
if (t) {
|
|
PyObject* moduleName;
|
|
char* className = PyExceptionClass_Name(t);
|
|
|
|
if (className != NULL) {
|
|
char *dot = strrchr(className, '.');
|
|
if (dot != NULL)
|
|
className = dot+1;
|
|
}
|
|
|
|
moduleName = PyObject_GetAttrString(t, "__module__");
|
|
if (moduleName == NULL)
|
|
PyFile_WriteString("<unknown>", f);
|
|
else {
|
|
char* modstr = PyString_AsString(moduleName);
|
|
if (modstr)
|
|
{
|
|
PyFile_WriteString(modstr, f);
|
|
PyFile_WriteString(".", f);
|
|
}
|
|
}
|
|
if (className == NULL)
|
|
PyFile_WriteString("<unknown>", f);
|
|
else
|
|
PyFile_WriteString(className, f);
|
|
if (v && v != Py_None) {
|
|
PyFile_WriteString(": ", f);
|
|
PyFile_WriteObject(v, f, 0);
|
|
}
|
|
Py_XDECREF(moduleName);
|
|
}
|
|
PyFile_WriteString(" in ", f);
|
|
PyFile_WriteObject(obj, f, 0);
|
|
PyFile_WriteString(" ignored\n", f);
|
|
PyErr_Clear(); /* Just in case */
|
|
}
|
|
Py_XDECREF(t);
|
|
Py_XDECREF(v);
|
|
Py_XDECREF(tb);
|
|
}
|
|
|
|
extern PyObject *PyModule_GetWarningsModule(void);
|
|
|
|
/* Function to issue a warning message; may raise an exception. */
|
|
int
|
|
PyErr_WarnEx(PyObject *category, const char *message, Py_ssize_t stack_level)
|
|
{
|
|
PyObject *dict, *func = NULL;
|
|
PyObject *warnings_module = PyModule_GetWarningsModule();
|
|
|
|
if (warnings_module != NULL) {
|
|
dict = PyModule_GetDict(warnings_module);
|
|
if (dict != NULL)
|
|
func = PyDict_GetItemString(dict, "warn");
|
|
}
|
|
if (func == NULL) {
|
|
PySys_WriteStderr("warning: %s\n", message);
|
|
return 0;
|
|
}
|
|
else {
|
|
PyObject *res;
|
|
|
|
if (category == NULL)
|
|
category = PyExc_RuntimeWarning;
|
|
res = PyObject_CallFunction(func, "sOn",
|
|
message, category, stack_level);
|
|
if (res == NULL)
|
|
return -1;
|
|
Py_DECREF(res);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/* PyErr_Warn is only for backwards compatability and will be removed.
|
|
Use PyErr_WarnEx instead. */
|
|
|
|
#undef PyErr_Warn
|
|
|
|
PyAPI_FUNC(int)
|
|
PyErr_Warn(PyObject *category, char *message)
|
|
{
|
|
return PyErr_WarnEx(category, message, 1);
|
|
}
|
|
|
|
/* Warning with explicit origin */
|
|
int
|
|
PyErr_WarnExplicit(PyObject *category, const char *message,
|
|
const char *filename, int lineno,
|
|
const char *module, PyObject *registry)
|
|
{
|
|
PyObject *mod, *dict, *func = NULL;
|
|
|
|
mod = PyImport_ImportModule("warnings");
|
|
if (mod != NULL) {
|
|
dict = PyModule_GetDict(mod);
|
|
func = PyDict_GetItemString(dict, "warn_explicit");
|
|
Py_DECREF(mod);
|
|
}
|
|
if (func == NULL) {
|
|
PySys_WriteStderr("warning: %s\n", message);
|
|
return 0;
|
|
}
|
|
else {
|
|
PyObject *res;
|
|
|
|
if (category == NULL)
|
|
category = PyExc_RuntimeWarning;
|
|
if (registry == NULL)
|
|
registry = Py_None;
|
|
res = PyObject_CallFunction(func, "sOsizO", message, category,
|
|
filename, lineno, module, registry);
|
|
if (res == NULL)
|
|
return -1;
|
|
Py_DECREF(res);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
/* Set file and line information for the current exception.
|
|
If the exception is not a SyntaxError, also sets additional attributes
|
|
to make printing of exceptions believe it is a syntax error. */
|
|
|
|
void
|
|
PyErr_SyntaxLocation(const char *filename, int lineno)
|
|
{
|
|
PyObject *exc, *v, *tb, *tmp;
|
|
|
|
/* add attributes for the line number and filename for the error */
|
|
PyErr_Fetch(&exc, &v, &tb);
|
|
PyErr_NormalizeException(&exc, &v, &tb);
|
|
/* XXX check that it is, indeed, a syntax error. It might not
|
|
* be, though. */
|
|
tmp = PyInt_FromLong(lineno);
|
|
if (tmp == NULL)
|
|
PyErr_Clear();
|
|
else {
|
|
if (PyObject_SetAttrString(v, "lineno", tmp))
|
|
PyErr_Clear();
|
|
Py_DECREF(tmp);
|
|
}
|
|
if (filename != NULL) {
|
|
tmp = PyString_FromString(filename);
|
|
if (tmp == NULL)
|
|
PyErr_Clear();
|
|
else {
|
|
if (PyObject_SetAttrString(v, "filename", tmp))
|
|
PyErr_Clear();
|
|
Py_DECREF(tmp);
|
|
}
|
|
|
|
tmp = PyErr_ProgramText(filename, lineno);
|
|
if (tmp) {
|
|
if (PyObject_SetAttrString(v, "text", tmp))
|
|
PyErr_Clear();
|
|
Py_DECREF(tmp);
|
|
}
|
|
}
|
|
if (PyObject_SetAttrString(v, "offset", Py_None)) {
|
|
PyErr_Clear();
|
|
}
|
|
if (exc != PyExc_SyntaxError) {
|
|
if (!PyObject_HasAttrString(v, "msg")) {
|
|
tmp = PyObject_Str(v);
|
|
if (tmp) {
|
|
if (PyObject_SetAttrString(v, "msg", tmp))
|
|
PyErr_Clear();
|
|
Py_DECREF(tmp);
|
|
} else {
|
|
PyErr_Clear();
|
|
}
|
|
}
|
|
if (!PyObject_HasAttrString(v, "print_file_and_line")) {
|
|
if (PyObject_SetAttrString(v, "print_file_and_line",
|
|
Py_None))
|
|
PyErr_Clear();
|
|
}
|
|
}
|
|
PyErr_Restore(exc, v, tb);
|
|
}
|
|
|
|
/* com_fetch_program_text will attempt to load the line of text that
|
|
the exception refers to. If it fails, it will return NULL but will
|
|
not set an exception.
|
|
|
|
XXX The functionality of this function is quite similar to the
|
|
functionality in tb_displayline() in traceback.c.
|
|
*/
|
|
|
|
PyObject *
|
|
PyErr_ProgramText(const char *filename, int lineno)
|
|
{
|
|
FILE *fp;
|
|
int i;
|
|
char linebuf[1000];
|
|
|
|
if (filename == NULL || *filename == '\0' || lineno <= 0)
|
|
return NULL;
|
|
fp = fopen(filename, "r" PY_STDIOTEXTMODE);
|
|
if (fp == NULL)
|
|
return NULL;
|
|
for (i = 0; i < lineno; i++) {
|
|
char *pLastChar = &linebuf[sizeof(linebuf) - 2];
|
|
do {
|
|
*pLastChar = '\0';
|
|
if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, fp, NULL) == NULL)
|
|
break;
|
|
/* fgets read *something*; if it didn't get as
|
|
far as pLastChar, it must have found a newline
|
|
or hit the end of the file; if pLastChar is \n,
|
|
it obviously found a newline; else we haven't
|
|
yet seen a newline, so must continue */
|
|
} while (*pLastChar != '\0' && *pLastChar != '\n');
|
|
}
|
|
fclose(fp);
|
|
if (i == lineno) {
|
|
char *p = linebuf;
|
|
while (*p == ' ' || *p == '\t' || *p == '\014')
|
|
p++;
|
|
return PyString_FromString(p);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|