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

annotate Python/errors.c @ 16831:27f04d714ecb legacy-trunk

Print the offending line of code in the traceback for SyntaxErrors raised by the compiler. XXX For now, text entered into the interactive intepreter is not printed in the traceback. Inspired by a patch from Roman Sulzhyk compile.c: Add helper fetch_program_text() that opens a file and reads until it finds the specified line number. The code is a near duplicate of similar code in traceback.c. Modify com_error() to pass two arguments to SyntaxError constructor, where the second argument contains the offending text when possible. Modify set_error_location(), now used only by the symtable pass, to set the text attribute on existing exceptions. pythonrun.c: Change parse_syntax_error() to continue of the offset attribute of a SyntaxError is None. In this case, it sets offset to -1. Move code from PyErr_PrintEx() into helper function print_error_text(). In the helper, only print the caret for a SyntaxError if offset > 0.

author	Jeremy Hylton <jeremy@alum.mit.edu>
date	Wed, 28 Feb 2001 07:07:43 +0000
parents	36286632ff3a
children	09f6c1372056

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 90 diff changeset	1
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2 /* Error handling */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	4 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 66 diff changeset	5
2019 9e3469c0ed75 Added hook for better mac error messages. Jack Jansen <jack.jansen@cwi.nl> parents: 2003 diff changeset	6 #ifdef macintosh
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	7 extern char *PyMac_StrError(int);
2190 b40e10bda231 Undef strerror on the mac before redefining it Jack Jansen <jack.jansen@cwi.nl> parents: 2062 diff changeset	8 #undef strerror
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	9 #define strerror PyMac_StrError
c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	10 #endif /* macintosh */
c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	11
2502 d5978238e3ba changes in NT tests Guido van Rossum <guido@python.org> parents: 2376 diff changeset	12 #ifndef __STDC__
5318 2c4b802a3b5d Keep Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5312 diff changeset	13 #ifndef MS_WINDOWS
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	14 extern char *strerror(int);
2502 d5978238e3ba changes in NT tests Guido van Rossum <guido@python.org> parents: 2376 diff changeset	15 #endif
5318 2c4b802a3b5d Keep Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5312 diff changeset	16 #endif
59 433f52d1d958 Added prototype for strerror. Guido van Rossum <guido@python.org> parents: 37 diff changeset	17
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	18 #ifdef MS_WIN32
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	19 #include "windows.h"
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	20 #include "winbase.h"
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	21 #endif
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	22
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	23 #include <ctype.h>
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	24
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	25 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	26 PyErr_Restore(PyObject type, PyObject value, PyObject *traceback)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	27 {
9671 1d40bc25703a Use PyThreadState_GET() macro. Guido van Rossum <guido@python.org> parents: 9365 diff changeset	28 PyThreadState *tstate = PyThreadState_GET();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	29 PyObject oldtype, oldvalue, *oldtraceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	30
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	31 if (traceback != NULL && !PyTraceBack_Check(traceback)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	32 /* XXX Should never happen -- fatal error instead? */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	33 Py_DECREF(traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	34 traceback = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	35 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	36
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	37 /* Save these in locals to safeguard against recursive
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	38 invocation through Py_XDECREF */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	39 oldtype = tstate->curexc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	40 oldvalue = tstate->curexc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	41 oldtraceback = tstate->curexc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	42
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	43 tstate->curexc_type = type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	44 tstate->curexc_value = value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	45 tstate->curexc_traceback = traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	46
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	47 Py_XDECREF(oldtype);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	48 Py_XDECREF(oldvalue);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	49 Py_XDECREF(oldtraceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	50 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	51
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	52 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	53 PyErr_SetObject(PyObject exception, PyObject value)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	55 Py_XINCREF(exception);
1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	56 Py_XINCREF(value);
1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	57 PyErr_Restore(exception, value, (PyObject *)NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	58 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	59
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	60 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	61 PyErr_SetNone(PyObject *exception)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	63 PyErr_SetObject(exception, (PyObject *)NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	64 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	66 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	67 PyErr_SetString(PyObject exception, const char string)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	68 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	69 PyObject *value = PyString_FromString(string);
1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	70 PyErr_SetObject(exception, value);
1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	71 Py_XDECREF(value);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	72 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	73
1832 79e420805c67 err_clear: clear interpreter stack trace Guido van Rossum <guido@python.org> parents: 1319 diff changeset	74
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	75 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	76 PyErr_Occurred(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	77 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	78 PyThreadState *tstate = PyThreadState_Get();
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	79
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	80 return tstate->curexc_type;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	81 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	82
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	83
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	84 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	85 PyErr_GivenExceptionMatches(PyObject err, PyObject exc)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	86 {
12559 3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	87 if (err == NULL \|\| exc == NULL) {
3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	88 /* maybe caused by "import exceptions" that failed early on */
3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	89 return 0;
3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	90 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	91 if (PyTuple_Check(exc)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	92 int i, n;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	93 n = PyTuple_Size(exc);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	94 for (i = 0; i < n; i++) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	95 /* Test recursively */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	96 if (PyErr_GivenExceptionMatches(
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	97 err, PyTuple_GET_ITEM(exc, i)))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	98 {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	99 return 1;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	100 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	101 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	102 return 0;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	103 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	104 /* err might be an instance, so check its class. */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	105 if (PyInstance_Check(err))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	106 err = (PyObject)((PyInstanceObject)err)->in_class;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	107
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	108 if (PyClass_Check(err) && PyClass_Check(exc))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	109 return PyClass_IsSubclass(err, exc);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	110
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	111 return err == exc;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	112 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	113
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	114
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	115 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	116 PyErr_ExceptionMatches(PyObject *exc)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	117 {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	118 return PyErr_GivenExceptionMatches(PyErr_Occurred(), exc);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	119 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	120
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	121
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	122 /* Used in many places to normalize a raised exception, including in
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	123 eval_code2(), do_raise(), and PyErr_Print()
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	124 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	125 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	126 PyErr_NormalizeException(PyObject exc, PyObject val, PyObject **tb)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	127 {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	128 PyObject type = exc;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	129 PyObject value = val;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	130 PyObject *inclass = NULL;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	131
13883 15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	132 if (type == NULL) {
15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	133 /* This is a bug. Should never happen. Don't dump core. */
15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	134 PyErr_SetString(PyExc_SystemError,
15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	135 "PyErr_NormalizeException() called without exception");
15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	136 }
15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	137
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	138 /* If PyErr_SetNone() was used, the value will have been actually
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	139 set to NULL.
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	140 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	141 if (!value) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	142 value = Py_None;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	143 Py_INCREF(value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	144 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	145
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	146 if (PyInstance_Check(value))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	147 inclass = (PyObject)((PyInstanceObject)value)->in_class;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	148
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	149 /* Normalize the exception so that if the type is a class, the
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	150 value will be an instance.
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	151 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	152 if (PyClass_Check(type)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	153 /* if the value was not an instance, or is not an instance
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	154 whose class is (or is derived from) type, then use the
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	155 value as an argument to instantiation of the type
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	156 class.
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	157 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	158 if (!inclass \|\| !PyClass_IsSubclass(inclass, type)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	159 PyObject args, res;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	160
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	161 if (value == Py_None)
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	162 args = Py_BuildValue("()");
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	163 else if (PyTuple_Check(value)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	164 Py_INCREF(value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	165 args = value;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	166 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	167 else
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	168 args = Py_BuildValue("(O)", value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	169
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	170 if (args == NULL)
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	171 goto finally;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	172 res = PyEval_CallObject(type, args);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	173 Py_DECREF(args);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	174 if (res == NULL)
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	175 goto finally;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	176 Py_DECREF(value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	177 value = res;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	178 }
6358 9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	179 /* if the class of the instance doesn't exactly match the
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	180 class of the type, believe the instance
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	181 */
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	182 else if (inclass != type) {
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	183 Py_DECREF(type);
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	184 type = inclass;
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	185 Py_INCREF(type);
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	186 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	187 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	188 *exc = type;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	189 *val = value;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	190 return;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	191 finally:
6789 bb440a2975ab Fix subtle bug in cleanup code in PyErr_NormalizeException(), detected Guido van Rossum <guido@python.org> parents: 6377 diff changeset	192 Py_DECREF(type);
bb440a2975ab Fix subtle bug in cleanup code in PyErr_NormalizeException(), detected Guido van Rossum <guido@python.org> parents: 6377 diff changeset	193 Py_DECREF(value);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	194 Py_XDECREF(*tb);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	195 PyErr_Fetch(exc, val, tb);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	196 /* normalize recursively */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	197 PyErr_NormalizeException(exc, val, tb);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	198 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	199
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	200
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	201 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	202 PyErr_Fetch(PyObject p_type, PyObject p_value, PyObject **p_traceback)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	203 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	204 PyThreadState *tstate = PyThreadState_Get();
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	205
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	206 *p_type = tstate->curexc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	207 *p_value = tstate->curexc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	208 *p_traceback = tstate->curexc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	209
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	210 tstate->curexc_type = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	211 tstate->curexc_value = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	212 tstate->curexc_traceback = NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	213 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	214
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	215 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	216 PyErr_Clear(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	217 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	218 PyErr_Restore(NULL, NULL, NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219 }
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	220
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	221 /* Convenience functions to set a type error exception and return 0 */
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	222
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	223 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	224 PyErr_BadArgument(void)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	225 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	226 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15148 diff changeset	227 "bad argument type for built-in operation");
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	228 return 0;
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	229 }
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	230
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	231 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	232 PyErr_NoMemory(void)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	233 {
14066 25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	234 if (PyErr_ExceptionMatches(PyExc_MemoryError))
25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	235 /* already current */
25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	236 return NULL;
25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	237
6190 b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	238 /* raise the pre-allocated instance if it still exists */
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	239 if (PyExc_MemoryErrorInst)
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	240 PyErr_SetObject(PyExc_MemoryError, PyExc_MemoryErrorInst);
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	241 else
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	242 /* this will probably fail since there's no memory and hee,
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	243 hee, we have to instantiate this class
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	244 */
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	245 PyErr_SetNone(PyExc_MemoryError);
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	246
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	247 return NULL;
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	248 }
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	249
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	250 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	251 PyErr_SetFromErrnoWithFilename(PyObject exc, char filename)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	252 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	253 PyObject *v;
9365 c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	254 char *s;
1832 79e420805c67 err_clear: clear interpreter stack trace Guido van Rossum <guido@python.org> parents: 1319 diff changeset	255 int i = errno;
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	256 #ifdef MS_WIN32
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	257 char *s_buf = NULL;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	258 #endif
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	259 #ifdef EINTR
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	260 if (i == EINTR && PyErr_CheckSignals())
390 172aa2c3e734 Check for EINTR and turn it into KeyboardInterrupt Guido van Rossum <guido@python.org> parents: 145 diff changeset	261 return NULL;
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	262 #endif
9365 c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	263 if (i == 0)
c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	264 s = "Error"; /* Sometimes errno didn't get set */
c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	265 else
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	266 #ifndef MS_WIN32
9365 c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	267 s = strerror(i);
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	268 #else
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	269 {
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	270 /* Note that the Win32 errors do not lineup with the
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	271 errno error. So if the error is in the MSVC error
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	272 table, we use it, otherwise we assume it really _is_
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	273 a Win32 error code
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	274 */
11825 4080c7a0f1ed Mark pointed out a buglet in his patch: i < _sys_nerr isn't strong Guido van Rossum <guido@python.org> parents: 11801 diff changeset	275 if (i > 0 && i < _sys_nerr) {
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	276 s = _sys_errlist[i];
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	277 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	278 else {
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	279 int len = FormatMessage(
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	280 FORMAT_MESSAGE_ALLOCATE_BUFFER \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	281 FORMAT_MESSAGE_FROM_SYSTEM \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	282 FORMAT_MESSAGE_IGNORE_INSERTS,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	283 NULL, /* no message source */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	284 i,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	285 MAKELANGID(LANG_NEUTRAL,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	286 SUBLANG_DEFAULT),
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	287 /* Default language */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	288 (LPTSTR) &s_buf,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	289 0, /* size not used */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	290 NULL); /* no args */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	291 s = s_buf;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	292 /* remove trailing cr/lf and dots */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	293 while (len > 0 && (s[len-1] <= ' ' \|\| s[len-1] == '.'))
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	294 s[--len] = '\0';
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	295 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	296 }
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	297 #endif
12559 3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	298 if (filename != NULL)
9365 c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	299 v = Py_BuildValue("(iss)", i, s, filename);
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	300 else
9365 c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	301 v = Py_BuildValue("(is)", i, s);
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	302 if (v != NULL) {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	303 PyErr_SetObject(exc, v);
1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	304 Py_DECREF(v);
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	305 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	306 #ifdef MS_WIN32
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	307 LocalFree(s_buf);
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	308 #endif
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	309 return NULL;
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	310 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	311
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	312
ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	313 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	314 PyErr_SetFromErrno(PyObject *exc)
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	315 {
ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	316 return PyErr_SetFromErrnoWithFilename(exc, NULL);
ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	317 }
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	318
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	319 #ifdef MS_WINDOWS
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	320 /* Windows specific error code handling */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	321 PyObject *PyErr_SetFromWindowsErrWithFilename(
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	322 int ierr,
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	323 const char *filename)
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	324 {
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	325 int len;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	326 char *s;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	327 PyObject *v;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	328 DWORD err = (DWORD)ierr;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	329 if (err==0) err = GetLastError();
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	330 len = FormatMessage(
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	331 /* Error API error */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	332 FORMAT_MESSAGE_ALLOCATE_BUFFER \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	333 FORMAT_MESSAGE_FROM_SYSTEM \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	334 FORMAT_MESSAGE_IGNORE_INSERTS,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	335 NULL, /* no message source */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	336 err,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	337 MAKELANGID(LANG_NEUTRAL,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	338 SUBLANG_DEFAULT), /* Default language */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	339 (LPTSTR) &s,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	340 0, /* size not used */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	341 NULL); /* no args */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	342 /* remove trailing cr/lf and dots */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	343 while (len > 0 && (s[len-1] <= ' ' \|\| s[len-1] == '.'))
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	344 s[--len] = '\0';
12559 3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	345 if (filename != NULL)
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	346 v = Py_BuildValue("(iss)", err, s, filename);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	347 else
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	348 v = Py_BuildValue("(is)", err, s);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	349 if (v != NULL) {
11899 723efcdcce1b Mark discovered a bug in his patch: he didn't use PyExc_WindowsError Guido van Rossum <guido@python.org> parents: 11825 diff changeset	350 PyErr_SetObject(PyExc_WindowsError, v);
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	351 Py_DECREF(v);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	352 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	353 LocalFree(s);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	354 return NULL;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	355 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	356
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	357 PyObject *PyErr_SetFromWindowsErr(int ierr)
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	358 {
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	359 return PyErr_SetFromWindowsErrWithFilename(ierr, NULL);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	360 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	361 #endif /* MS_WINDOWS */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	362
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	363 void
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	364 _PyErr_BadInternalCall(char *filename, int lineno)
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	365 {
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	366 PyErr_Format(PyExc_SystemError,
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	367 "%s:%d: bad argument to internal function",
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	368 filename, lineno);
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	369 }
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	370
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	371 /* Remove the preprocessor macro for PyErr_BadInternalCall() so that we can
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	372 export the entry point for existing object code: */
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	373 #undef PyErr_BadInternalCall
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	374 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	375 PyErr_BadInternalCall(void)
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	376 {
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	377 PyErr_Format(PyExc_SystemError,
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	378 "bad argument to internal function");
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	379 }
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	380 #define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	381
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	382
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	383
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	384 PyObject *
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	385 PyErr_Format(PyObject exception, const char format, ...)
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	386 {
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	387 va_list vargs;
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	388 int n, i;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	389 const char* f;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	390 char* s;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	391 PyObject* string;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	392
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	393 /* step 1: figure out how large a buffer we need */
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	394
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	395 #ifdef HAVE_STDARG_PROTOTYPES
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	396 va_start(vargs, format);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	397 #else
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	398 va_start(vargs);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	399 #endif
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	400
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	401 n = 0;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	402 for (f = format; *f; f++) {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	403 if (*f == '%') {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	404 const char* p = f;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	405 while (++f && f != '%' && !isalpha(*f))
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	406 ;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	407 switch (*f) {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	408 case 'c':
15148 a2fcc487b9da Avoid a couple of "value computed is not used" warnings from gcc -Wall; Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	409 (void) va_arg(vargs, int);
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	410 /* fall through... */
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	411 case '%':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	412 n++;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	413 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	414 case 'd': case 'i': case 'x':
15148 a2fcc487b9da Avoid a couple of "value computed is not used" warnings from gcc -Wall; Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	415 (void) va_arg(vargs, int);
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	416 /* 20 bytes should be enough to hold a 64-bit
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	417 integer */
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	418 n = n + 20;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	419 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	420 case 's':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	421 s = va_arg(vargs, char*);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	422 n = n + strlen(s);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	423 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	424 default:
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	425 /* if we stumble upon an unknown
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	426 formatting code, copy the rest of
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	427 the format string to the output
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	428 string. (we cannot just skip the
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	429 code, since there's no way to know
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	430 what's in the argument list) */
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	431 n = n + strlen(p);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	432 goto expand;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	433 }
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	434 } else
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	435 n = n + 1;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	436 }
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	437
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	438 expand:
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	439
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	440 string = PyString_FromStringAndSize(NULL, n);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	441 if (!string)
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	442 return NULL;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	443
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	444 #ifdef HAVE_STDARG_PROTOTYPES
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	445 va_start(vargs, format);
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	446 #else
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	447 va_start(vargs);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	448 #endif
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	449
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	450 /* step 2: fill the buffer */
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	451
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	452 s = PyString_AsString(string);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	453
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	454 for (f = format; *f; f++) {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	455 if (*f == '%') {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	456 const char* p = f++;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	457 /* parse the width.precision part (we're only
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	458 interested in the precision value, if any) */
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	459 n = 0;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	460 while (isdigit(*f))
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	461 n = (n10) + f++ - '0';
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	462 if (*f == '.') {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	463 f++;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	464 n = 0;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	465 while (isdigit(*f))
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	466 n = (n10) + f++ - '0';
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	467 }
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	468 while (f && f != '%' && !isalpha(*f))
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	469 f++;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	470 switch (*f) {
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	471 case 'c':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	472 *s++ = va_arg(vargs, int);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	473 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	474 case 'd':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	475 sprintf(s, "%d", va_arg(vargs, int));
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	476 s = s + strlen(s);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	477 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	478 case 'i':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	479 sprintf(s, "%i", va_arg(vargs, int));
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	480 s = s + strlen(s);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	481 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	482 case 'x':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	483 sprintf(s, "%x", va_arg(vargs, int));
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	484 s = s + strlen(s);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	485 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	486 case 's':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	487 p = va_arg(vargs, char*);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	488 i = strlen(p);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	489 if (n > 0 && i > n)
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	490 i = n;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	491 memcpy(s, p, i);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	492 s = s + i;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	493 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	494 case '%':
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	495 *s++ = '%';
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	496 break;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	497 default:
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	498 strcpy(s, p);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	499 s = s + strlen(s);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	500 goto end;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	501 }
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	502 } else
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	503 s++ = f;
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	504 }
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	505
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	506 end:
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	507
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	508 _PyString_Resize(&string, s - PyString_AsString(string));
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	509
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	510 PyErr_SetObject(exception, string);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	511 Py_XDECREF(string);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	512
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	513 return NULL;
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	514 }
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	515
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	516
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	517 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	518 PyErr_NewException(char name, PyObject base, PyObject *dict)
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	519 {
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	520 char *dot;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	521 PyObject *modulename = NULL;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	522 PyObject *classname = NULL;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	523 PyObject *mydict = NULL;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	524 PyObject *bases = NULL;
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	525 PyObject *result = NULL;
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	526 dot = strrchr(name, '.');
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	527 if (dot == NULL) {
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	528 PyErr_SetString(PyExc_SystemError,
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	529 "PyErr_NewException: name must be module.class");
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	530 return NULL;
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	531 }
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	532 if (base == NULL)
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	533 base = PyExc_Exception;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	534 if (!PyClass_Check(base)) {
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	535 /* Must be using string-based standard exceptions (-X) */
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	536 return PyString_FromString(name);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	537 }
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	538 if (dict == NULL) {
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	539 dict = mydict = PyDict_New();
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	540 if (dict == NULL)
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	541 goto failure;
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	542 }
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	543 if (PyDict_GetItemString(dict, "__module__") == NULL) {
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	544 modulename = PyString_FromStringAndSize(name, (int)(dot-name));
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	545 if (modulename == NULL)
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	546 goto failure;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	547 if (PyDict_SetItemString(dict, "__module__", modulename) != 0)
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	548 goto failure;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	549 }
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	550 classname = PyString_FromString(dot+1);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	551 if (classname == NULL)
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	552 goto failure;
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	553 bases = Py_BuildValue("(O)", base);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	554 if (bases == NULL)
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	555 goto failure;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	556 result = PyClass_New(bases, dict, classname);
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	557 failure:
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	558 Py_XDECREF(bases);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	559 Py_XDECREF(mydict);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	560 Py_XDECREF(classname);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	561 Py_XDECREF(modulename);
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	562 return result;
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	563 }
14330 6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	564
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	565 /* Call when an exception has occurred but there is no way for Python
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	566 to handle it. Examples: exception in __del__ or during GC. */
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	567 void
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	568 PyErr_WriteUnraisable(PyObject *obj)
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	569 {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	570 PyObject f, t, v, tb;
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	571 PyErr_Fetch(&t, &v, &tb);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	572 f = PySys_GetObject("stderr");
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	573 if (f != NULL) {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	574 PyFile_WriteString("Exception ", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	575 if (t) {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	576 PyFile_WriteObject(t, f, Py_PRINT_RAW);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	577 if (v && v != Py_None) {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	578 PyFile_WriteString(": ", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	579 PyFile_WriteObject(v, f, 0);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	580 }
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	581 }
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	582 PyFile_WriteString(" in ", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	583 PyFile_WriteObject(obj, f, 0);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	584 PyFile_WriteString(" ignored\n", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	585 PyErr_Clear(); /* Just in case */
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	586 }
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	587 Py_XDECREF(t);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	588 Py_XDECREF(v);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	589 Py_XDECREF(tb);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	590 }
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	591
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	592
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	593 /* Function to issue a warning message; may raise an exception. */
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	594 int
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	595 PyErr_Warn(PyObject category, char message)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	596 {
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	597 PyObject mod, dict, *func = NULL;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	598
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	599 mod = PyImport_ImportModule("warnings");
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	600 if (mod != NULL) {
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	601 dict = PyModule_GetDict(mod);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	602 func = PyDict_GetItemString(dict, "warn");
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	603 Py_DECREF(mod);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	604 }
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	605 if (func == NULL) {
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	606 PySys_WriteStderr("warning: %s\n", message);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	607 return 0;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	608 }
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	609 else {
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	610 PyObject args, res;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	611
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	612 if (category == NULL)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	613 category = PyExc_RuntimeWarning;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	614 args = Py_BuildValue("(sO)", message, category);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	615 if (args == NULL)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	616 return -1;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	617 res = PyEval_CallObject(func, args);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	618 Py_DECREF(args);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	619 if (res == NULL)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	620 return -1;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	621 Py_DECREF(res);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	622 return 0;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	623 }
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	624 }

Mercurial > cpython-lru_cache-weakref

annotate Python/errors.c @ 16831:27f04d714ecb legacy-trunk