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

annotate Python/errors.c @ 36737:fa92fe15251a legacy-trunk

Updates to the with-statement: - New semantics for __exit__() -- it must re-raise the exception if type is not None; the with-statement itself doesn't do this. (See the updated PEP for motivation.) - Added context managers to: - file - thread.LockType - threading.{Lock,RLock,Condition,Semaphore,BoundedSemaphore} - decimal.Context - Added contextlib.py, which defines @contextmanager, nested(), closing(). - Unit tests all around; bot no docs yet.

author	Guido van Rossum <guido@python.org>
date	Tue, 28 Feb 2006 21:57:43 +0000
parents	e3248f1fc54d
children	8e04de2480e4

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
2502 d5978238e3ba changes in NT tests Guido van Rossum <guido@python.org> parents: 2376 diff changeset	6 #ifndef __STDC__
5318 2c4b802a3b5d Keep Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5312 diff changeset	7 #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	8 extern char *strerror(int);
2502 d5978238e3ba changes in NT tests Guido van Rossum <guido@python.org> parents: 2376 diff changeset	9 #endif
5318 2c4b802a3b5d Keep Microsoft VC happy. Guido van Rossum <guido@python.org> parents: 5312 diff changeset	10 #endif
59 433f52d1d958 Added prototype for strerror. Guido van Rossum <guido@python.org> parents: 37 diff changeset	11
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23029 diff changeset	12 #ifdef MS_WINDOWS
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	13 #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	14 #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	15 #endif
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	16
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	17 #include <ctype.h>
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	18
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	20 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	21 {
9671 1d40bc25703a Use PyThreadState_GET() macro. Guido van Rossum <guido@python.org> parents: 9365 diff changeset	22 PyThreadState *tstate = PyThreadState_GET();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	23 PyObject oldtype, oldvalue, *oldtraceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	24
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	25 if (traceback != NULL && !PyTraceBack_Check(traceback)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	26 /* XXX Should never happen -- fatal error instead? */
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36701 diff changeset	27 /* Well, it could be None. */
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	28 Py_DECREF(traceback);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	29 traceback = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	30 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	31
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	32 /* 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	33 invocation through Py_XDECREF */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	34 oldtype = tstate->curexc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	35 oldvalue = tstate->curexc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	36 oldtraceback = tstate->curexc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	37
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	38 tstate->curexc_type = type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	39 tstate->curexc_value = value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	40 tstate->curexc_traceback = traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	41
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	42 Py_XDECREF(oldtype);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	43 Py_XDECREF(oldvalue);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	44 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	45 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	46
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	47 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	48 PyErr_SetObject(PyObject exception, PyObject value)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	49 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	50 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	51 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	52 PyErr_Restore(exception, value, (PyObject *)NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	55 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	56 PyErr_SetNone(PyObject *exception)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	57 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	58 PyErr_SetObject(exception, (PyObject *)NULL);
6 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
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	61 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	62 PyErr_SetString(PyObject exception, const char string)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	64 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	65 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	66 Py_XDECREF(value);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	67 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	68
1832 79e420805c67 err_clear: clear interpreter stack trace Guido van Rossum <guido@python.org> parents: 1319 diff changeset	69
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	70 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	71 PyErr_Occurred(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	72 {
18007 6a2e2548e6cf PyErr_Occurred(): Use PyThreadState_GET(), which saves a tiny function call Tim Peters <tim.peters@gmail.com> parents: 16997 diff changeset	73 PyThreadState *tstate = PyThreadState_GET();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	74
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	75 return tstate->curexc_type;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	76 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	77
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	78
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	79 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	80 PyErr_GivenExceptionMatches(PyObject err, PyObject exc)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	81 {
12559 3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	82 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	83 /* 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	84 return 0;
3b8d9e63e4e1 PyErr_GivenExceptionMatches(): Check for err==NULL and exc==NULL and Barry Warsaw <barry@python.org> parents: 11899 diff changeset	85 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	86 if (PyTuple_Check(exc)) {
36521 30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 34440 diff changeset	87 Py_ssize_t i, n;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	88 n = PyTuple_Size(exc);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	89 for (i = 0; i < n; i++) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	90 /* Test recursively */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	91 if (PyErr_GivenExceptionMatches(
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	92 err, PyTuple_GET_ITEM(exc, i)))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	93 {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	94 return 1;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	95 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	96 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	97 return 0;
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 /* err might be an instance, so check its class. */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	100 if (PyInstance_Check(err))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	101 err = (PyObject)((PyInstanceObject)err)->in_class;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	102
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	103 if (PyClass_Check(err) && PyClass_Check(exc))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	104 return PyClass_IsSubclass(err, exc);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	105
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	106 return err == exc;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	107 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	108
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	109
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	110 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	111 PyErr_ExceptionMatches(PyObject *exc)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	112 {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	113 return PyErr_GivenExceptionMatches(PyErr_Occurred(), exc);
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
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	116
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	117 /* 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	118 eval_code2(), do_raise(), and PyErr_Print()
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 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	121 PyErr_NormalizeException(PyObject exc, PyObject val, PyObject **tb)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	122 {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	123 PyObject type = exc;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	124 PyObject value = val;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	125 PyObject *inclass = NULL;
20116 55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	126 PyObject *initial_tb = NULL;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	127
13883 15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	128 if (type == NULL) {
28571 5fbdcaef9dda PyErr_NormalizeException(): in the type==NULL test, we should simply Guido van Rossum <guido@python.org> parents: 27958 diff changeset	129 /* There was no exception, so nothing to do. */
5fbdcaef9dda PyErr_NormalizeException(): in the type==NULL test, we should simply Guido van Rossum <guido@python.org> parents: 27958 diff changeset	130 return;
13883 15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	131 }
15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	132
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	133 /* 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	134 set to NULL.
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	135 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	136 if (!value) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	137 value = Py_None;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	138 Py_INCREF(value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	139 }
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 (PyInstance_Check(value))
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	142 inclass = (PyObject)((PyInstanceObject)value)->in_class;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	143
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	144 /* 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	145 value will be an instance.
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	146 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	147 if (PyClass_Check(type)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	148 /* 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	149 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	150 value as an argument to instantiation of the type
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	151 class.
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	152 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	153 if (!inclass \|\| !PyClass_IsSubclass(inclass, type)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	154 PyObject args, res;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	155
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	156 if (value == Py_None)
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29877 diff changeset	157 args = PyTuple_New(0);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	158 else if (PyTuple_Check(value)) {
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	159 Py_INCREF(value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	160 args = value;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	161 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	162 else
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29877 diff changeset	163 args = PyTuple_Pack(1, value);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	164
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	165 if (args == NULL)
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	166 goto finally;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	167 res = PyEval_CallObject(type, args);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	168 Py_DECREF(args);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	169 if (res == NULL)
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	170 goto finally;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	171 Py_DECREF(value);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	172 value = res;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	173 }
6358 9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	174 /* 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	175 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	176 */
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	177 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	178 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	179 type = inclass;
9e82dd76288e PyErr_NormalizeException(): If the exception's type is a class and the Barry Warsaw <barry@python.org> parents: 6319 diff changeset	180 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	181 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	182 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	183 *exc = type;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	184 *val = value;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	185 return;
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	186 finally:
6789 bb440a2975ab Fix subtle bug in cleanup code in PyErr_NormalizeException(), detected Guido van Rossum <guido@python.org> parents: 6377 diff changeset	187 Py_DECREF(type);
bb440a2975ab Fix subtle bug in cleanup code in PyErr_NormalizeException(), detected Guido van Rossum <guido@python.org> parents: 6377 diff changeset	188 Py_DECREF(value);
20116 55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	189 /* If the new exception doesn't set a traceback and the old
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	190 exception had a traceback, use the old traceback for the
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	191 new exception. It's better than nothing.
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	192 */
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	193 initial_tb = *tb;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	194 PyErr_Fetch(exc, val, tb);
20116 55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	195 if (initial_tb != NULL) {
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	196 if (*tb == NULL)
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	197 *tb = initial_tb;
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	198 else
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	199 Py_DECREF(initial_tb);
55874d8e0dfb PyErr_NormalizeException() Jeremy Hylton <jeremy@alum.mit.edu> parents: 19477 diff changeset	200 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	201 /* normalize recursively */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	202 PyErr_NormalizeException(exc, val, tb);
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	203 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	204
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	205
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	206 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	207 PyErr_Fetch(PyObject p_type, PyObject p_value, PyObject **p_traceback)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	208 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 30979 diff changeset	209 PyThreadState *tstate = PyThreadState_GET();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	210
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	211 *p_type = tstate->curexc_type;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	212 *p_value = tstate->curexc_value;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	213 *p_traceback = tstate->curexc_traceback;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	214
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	215 tstate->curexc_type = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	216 tstate->curexc_value = NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	217 tstate->curexc_traceback = NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	218 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	220 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	221 PyErr_Clear(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	222 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	223 PyErr_Restore(NULL, NULL, NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	224 }
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	225
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	226 /* 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	227
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	228 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	229 PyErr_BadArgument(void)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	230 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	231 PyErr_SetString(PyExc_TypeError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15148 diff changeset	232 "bad argument type for built-in operation");
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	233 return 0;
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	234 }
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	235
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	236 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	237 PyErr_NoMemory(void)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	238 {
14066 25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	239 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	240 /* already current */
25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	241 return NULL;
25eea88047e9 Do not set a MemoryError exception over another MemoryError exception, Vladimir Marangozov <vladimir.marangozov@t-online.de> parents: 13883 diff changeset	242
6190 b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	243 /* 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	244 if (PyExc_MemoryErrorInst)
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	245 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	246 else
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	247 /* 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	248 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	249 */
b5757e87eb32 PyErr_NoMemory(): If the pre-instantiated memory exception is non-null Barry Warsaw <barry@python.org> parents: 6146 diff changeset	250 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	251
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	252 return NULL;
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	253 }
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	254
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	255 PyObject *
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	256 PyErr_SetFromErrnoWithFilenameObject(PyObject exc, PyObject filenameObject)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	257 {
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	258 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	259 char *s;
1832 79e420805c67 err_clear: clear interpreter stack trace Guido van Rossum <guido@python.org> parents: 1319 diff changeset	260 int i = errno;
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	261 #ifdef PLAN9
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	262 char errbuf[ERRMAX];
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	263 #endif
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23029 diff changeset	264 #ifdef MS_WINDOWS
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	265 char *s_buf = NULL;
25544 2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	266 char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	267 #endif
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	268 #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	269 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	270 return NULL;
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	271 #endif
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	272 #ifdef PLAN9
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	273 rerrstr(errbuf, sizeof errbuf);
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	274 s = errbuf;
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	275 #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	276 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	277 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	278 else
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23029 diff changeset	279 #ifndef MS_WINDOWS
9365 c80321c328b5 When errno is zero, avoid calling strerror() and use "Error" for the Guido van Rossum <guido@python.org> parents: 8706 diff changeset	280 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	281 #else
df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	282 {
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	283 /* 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	284 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	285 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	286 a Win32 error code
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	287 */
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	288 if (i > 0 && i < _sys_nerr) {
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	289 s = _sys_errlist[i];
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	290 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	291 else {
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	292 int len = FormatMessage(
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	293 FORMAT_MESSAGE_ALLOCATE_BUFFER \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	294 FORMAT_MESSAGE_FROM_SYSTEM \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	295 FORMAT_MESSAGE_IGNORE_INSERTS,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	296 NULL, /* no message source */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	297 i,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	298 MAKELANGID(LANG_NEUTRAL,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	299 SUBLANG_DEFAULT),
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	300 /* Default language */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	301 (LPTSTR) &s_buf,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	302 0, /* size not used */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	303 NULL); /* no args */
25544 2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	304 if (len==0) {
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	305 /* Only ever seen this in out-of-mem
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	306 situations */
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	307 sprintf(s_small_buf, "Windows Error 0x%X", i);
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	308 s = s_small_buf;
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	309 s_buf = NULL;
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	310 } else {
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	311 s = s_buf;
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	312 /* remove trailing cr/lf and dots */
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	313 while (len > 0 && (s[len-1] <= ' ' \|\| s[len-1] == '.'))
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	314 s[--len] = '\0';
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	315 }
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	316 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	317 }
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	318 #endif /* Unix/Windows */
f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	319 #endif /* PLAN 9*/
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	320 if (filenameObject != NULL)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	321 v = Py_BuildValue("(isO)", i, s, filenameObject);
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	322 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	323 v = Py_BuildValue("(is)", i, s);
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	324 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	325 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	326 Py_DECREF(v);
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	327 }
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23029 diff changeset	328 #ifdef MS_WINDOWS
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	329 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	330 #endif
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	331 return NULL;
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	332 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	333
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	334
ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	335 PyObject *
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	336 PyErr_SetFromErrnoWithFilename(PyObject exc, char filename)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	337 {
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	338 PyObject *name = filename ? PyString_FromString(filename) : NULL;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	339 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
25543 dfeec3b34fae Fix errors to pep277 checkin identified by Neal Norwitz. Mark Hammond <mhammond@skippinet.com.au> parents: 25535 diff changeset	340 Py_XDECREF(name);
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	341 return result;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	342 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	343
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	344 #ifdef Py_WIN_WIDE_FILENAMES
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	345 PyObject *
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	346 PyErr_SetFromErrnoWithUnicodeFilename(PyObject exc, Py_UNICODE filename)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	347 {
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	348 PyObject *name = filename ?
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	349 PyUnicode_FromUnicode(filename, wcslen(filename)) :
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	350 NULL;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	351 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	352 Py_XDECREF(name);
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	353 return result;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	354 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	355 #endif /* Py_WIN_WIDE_FILENAMES */
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	356
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	357 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	358 PyErr_SetFromErrno(PyObject *exc)
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	359 {
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	360 return PyErr_SetFromErrnoWithFilenameObject(exc, NULL);
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	361 }
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	362
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	363 #ifdef MS_WINDOWS
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	364 /* Windows specific error code handling */
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	365 PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject(
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	366 PyObject *exc,
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	367 int ierr,
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	368 PyObject *filenameObject)
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	369 {
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	370 int len;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	371 char *s;
25544 2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	372 char s_buf = NULL; / Free via LocalFree */
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	373 char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	374 PyObject *v;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	375 DWORD err = (DWORD)ierr;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	376 if (err==0) err = GetLastError();
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	377 len = FormatMessage(
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	378 /* Error API error */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	379 FORMAT_MESSAGE_ALLOCATE_BUFFER \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	380 FORMAT_MESSAGE_FROM_SYSTEM \|
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	381 FORMAT_MESSAGE_IGNORE_INSERTS,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	382 NULL, /* no message source */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	383 err,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	384 MAKELANGID(LANG_NEUTRAL,
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	385 SUBLANG_DEFAULT), /* Default language */
25544 2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	386 (LPTSTR) &s_buf,
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	387 0, /* size not used */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	388 NULL); /* no args */
25544 2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	389 if (len==0) {
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	390 /* Only seen this in out of mem situations */
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	391 sprintf(s_small_buf, "Windows Error 0x%X", err);
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	392 s = s_small_buf;
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	393 s_buf = NULL;
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	394 } else {
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	395 s = s_buf;
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	396 /* remove trailing cr/lf and dots */
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	397 while (len > 0 && (s[len-1] <= ' ' \|\| s[len-1] == '.'))
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	398 s[--len] = '\0';
2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	399 }
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	400 if (filenameObject != NULL)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	401 v = Py_BuildValue("(isO)", err, s, filenameObject);
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	402 else
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	403 v = Py_BuildValue("(is)", err, s);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	404 if (v != NULL) {
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	405 PyErr_SetObject(exc, v);
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	406 Py_DECREF(v);
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	407 }
25544 2fa559fb6ec5 Fix [ 616716 ] Bug in PyErr_SetExcFromWindows Mark Hammond <mhammond@skippinet.com.au> parents: 25543 diff changeset	408 LocalFree(s_buf);
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	409 return NULL;
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	410 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	411
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	412 PyObject *PyErr_SetExcFromWindowsErrWithFilename(
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	413 PyObject *exc,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	414 int ierr,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	415 const char *filename)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	416 {
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	417 PyObject *name = filename ? PyString_FromString(filename) : NULL;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	418 PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	419 ierr,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	420 name);
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	421 Py_XDECREF(name);
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	422 return ret;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	423 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	424
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	425 #ifdef Py_WIN_WIDE_FILENAMES
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	426 PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename(
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	427 PyObject *exc,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	428 int ierr,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	429 const Py_UNICODE *filename)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	430 {
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	431 PyObject *name = filename ?
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	432 PyUnicode_FromUnicode(filename, wcslen(filename)) :
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	433 NULL;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	434 PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	435 ierr,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	436 name);
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	437 Py_XDECREF(name);
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	438 return ret;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	439 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	440 #endif /* Py_WIN_WIDE_FILENAMES */
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	441
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	442 PyObject PyErr_SetExcFromWindowsErr(PyObject exc, int ierr)
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	443 {
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	444 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL);
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	445 }
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	446
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	447 PyObject *PyErr_SetFromWindowsErr(int ierr)
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	448 {
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	449 return PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError,
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	450 ierr, NULL);
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	451 }
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	452 PyObject *PyErr_SetFromWindowsErrWithFilename(
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	453 int ierr,
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	454 const char *filename)
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	455 {
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	456 PyObject *name = filename ? PyString_FromString(filename) : NULL;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	457 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	458 PyExc_WindowsError,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	459 ierr, name);
25543 dfeec3b34fae Fix errors to pep277 checkin identified by Neal Norwitz. Mark Hammond <mhammond@skippinet.com.au> parents: 25535 diff changeset	460 Py_XDECREF(name);
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	461 return result;
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	462 }
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	463
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	464 #ifdef Py_WIN_WIDE_FILENAMES
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	465 PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename(
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	466 int ierr,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	467 const Py_UNICODE *filename)
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	468 {
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	469 PyObject *name = filename ?
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	470 PyUnicode_FromUnicode(filename, wcslen(filename)) :
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	471 NULL;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	472 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	473 PyExc_WindowsError,
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	474 ierr, name);
25543 dfeec3b34fae Fix errors to pep277 checkin identified by Neal Norwitz. Mark Hammond <mhammond@skippinet.com.au> parents: 25535 diff changeset	475 Py_XDECREF(name);
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	476 return result;
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	477 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	478 #endif /* Py_WIN_WIDE_FILENAMES */
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	479 #endif /* MS_WINDOWS */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	480
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	481 void
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	482 _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	483 {
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	484 PyErr_Format(PyExc_SystemError,
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	485 "%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	486 filename, lineno);
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	487 }
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	488
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	489 /* 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	490 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	491 #undef PyErr_BadInternalCall
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	492 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	493 PyErr_BadInternalCall(void)
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	494 {
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	495 PyErr_Format(PyExc_SystemError,
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	496 "bad argument to internal function");
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	497 }
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	498 #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	499
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	500
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	501
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	502 PyObject *
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	503 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	504 {
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	505 va_list vargs;
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	506 PyObject* string;
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 #ifdef HAVE_STDARG_PROTOTYPES
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	509 va_start(vargs, format);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	510 #else
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	511 va_start(vargs);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	512 #endif
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	513
19477 e1c91ac55cca PyErr_Format(): Factor out most of this code into Barry Warsaw <barry@python.org> parents: 18007 diff changeset	514 string = PyString_FromFormatV(format, vargs);
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	515 PyErr_SetObject(exception, string);
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	516 Py_XDECREF(string);
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20116 diff changeset	517 va_end(vargs);
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	518 return NULL;
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	519 }
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	520
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	521
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	522 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	523 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	524 {
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	525 char *dot;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	526 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	527 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	528 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	529 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	530 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	531 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	532 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	533 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	534 "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	535 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	536 }
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	537 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	538 base = PyExc_Exception;
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	539 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	540 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	541 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	542 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	543 }
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	544 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	545 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	546 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	547 goto failure;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	548 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	549 goto failure;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	550 }
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	551 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	552 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	553 goto failure;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 29877 diff changeset	554 bases = PyTuple_Pack(1, base);
6377 4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	555 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	556 goto failure;
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	557 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	558 failure:
6377 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(bases);
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(mydict);
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(classname);
4cb223f29337 New version of PyErr_NewException() that is compatible with -X option. Guido van Rossum <guido@python.org> parents: 6358 diff changeset	562 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	563 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	564 }
14330 6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	565
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	566 /* 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	567 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	568 void
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	569 PyErr_WriteUnraisable(PyObject *obj)
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	570 {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	571 PyObject f, t, v, tb;
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	572 PyErr_Fetch(&t, &v, &tb);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	573 f = PySys_GetObject("stderr");
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	574 if (f != NULL) {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	575 PyFile_WriteString("Exception ", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	576 if (t) {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	577 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	578 if (v && v != Py_None) {
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	579 PyFile_WriteString(": ", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	580 PyFile_WriteObject(v, f, 0);
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 }
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	583 PyFile_WriteString(" in ", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	584 PyFile_WriteObject(obj, f, 0);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	585 PyFile_WriteString(" ignored\n", f);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	586 PyErr_Clear(); /* Just in case */
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	587 }
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	588 Py_XDECREF(t);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	589 Py_XDECREF(v);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	590 Py_XDECREF(tb);
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	591 }
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	592
30781 74747f62f286 Made function declaration a proper C prototype Armin Rigo <arigo@tunes.org> parents: 30683 diff changeset	593 extern PyObject *PyModule_GetWarningsModule(void);
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	594
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	595 /* Function to issue a warning message; may raise an exception. */
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	596 int
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	597 PyErr_Warn(PyObject category, char message)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	598 {
27958 e07b21ea3c45 Fix bug 683658 - PyErr_Warn may cause import deadlock. Mark Hammond <mhammond@skippinet.com.au> parents: 26601 diff changeset	599 PyObject dict, func = NULL;
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28571 diff changeset	600 PyObject *warnings_module = PyModule_GetWarningsModule();
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	601
29877 72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28571 diff changeset	602 if (warnings_module != NULL) {
72cbc41ccc2f Fix [ 771097 ] frozen programs fail due to implicit import of "warnings". Mark Hammond <mhammond@skippinet.com.au> parents: 28571 diff changeset	603 dict = PyModule_GetDict(warnings_module);
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	604 func = PyDict_GetItemString(dict, "warn");
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	605 }
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	606 if (func == NULL) {
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	607 PySys_WriteStderr("warning: %s\n", message);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	608 return 0;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	609 }
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	610 else {
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	611 PyObject args, res;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	612
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	613 if (category == NULL)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	614 category = PyExc_RuntimeWarning;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	615 args = Py_BuildValue("(sO)", message, category);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	616 if (args == NULL)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	617 return -1;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	618 res = PyEval_CallObject(func, args);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	619 Py_DECREF(args);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	620 if (res == NULL)
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	621 return -1;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	622 Py_DECREF(res);
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	623 return 0;
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	624 }
36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	625 }
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	626
16850 2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	627
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	628 /* Warning with explicit origin */
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	629 int
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 25544 diff changeset	630 PyErr_WarnExplicit(PyObject category, const char message,
cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 25544 diff changeset	631 const char *filename, int lineno,
cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 25544 diff changeset	632 const char module, PyObject registry)
16850 2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	633 {
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	634 PyObject mod, dict, *func = NULL;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	635
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	636 mod = PyImport_ImportModule("warnings");
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	637 if (mod != NULL) {
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	638 dict = PyModule_GetDict(mod);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	639 func = PyDict_GetItemString(dict, "warn_explicit");
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	640 Py_DECREF(mod);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	641 }
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	642 if (func == NULL) {
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	643 PySys_WriteStderr("warning: %s\n", message);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	644 return 0;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	645 }
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	646 else {
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	647 PyObject args, res;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	648
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	649 if (category == NULL)
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	650 category = PyExc_RuntimeWarning;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	651 if (registry == NULL)
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	652 registry = Py_None;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	653 args = Py_BuildValue("(sOsizO)", message, category,
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	654 filename, lineno, module, registry);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	655 if (args == NULL)
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	656 return -1;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	657 res = PyEval_CallObject(func, args);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	658 Py_DECREF(args);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	659 if (res == NULL)
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	660 return -1;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	661 Py_DECREF(res);
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	662 return 0;
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	663 }
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	664 }
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	665
2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	666
22121 d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	667 /* Set file and line information for the current exception.
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	668 If the exception is not a SyntaxError, also sets additional attributes
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	669 to make printing of exceptions believe it is a syntax error. */
16850 2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	670
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	671 void
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 25544 diff changeset	672 PyErr_SyntaxLocation(const char *filename, int lineno)
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	673 {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	674 PyObject exc, v, tb, tmp;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	675
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	676 /* add attributes for the line number and filename for the error */
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	677 PyErr_Fetch(&exc, &v, &tb);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	678 PyErr_NormalizeException(&exc, &v, &tb);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	679 /* XXX check that it is, indeed, a syntax error */
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	680 tmp = PyInt_FromLong(lineno);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	681 if (tmp == NULL)
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	682 PyErr_Clear();
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	683 else {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	684 if (PyObject_SetAttrString(v, "lineno", tmp))
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	685 PyErr_Clear();
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	686 Py_DECREF(tmp);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	687 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	688 if (filename != NULL) {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	689 tmp = PyString_FromString(filename);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	690 if (tmp == NULL)
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	691 PyErr_Clear();
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	692 else {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	693 if (PyObject_SetAttrString(v, "filename", tmp))
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	694 PyErr_Clear();
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	695 Py_DECREF(tmp);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	696 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	697
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	698 tmp = PyErr_ProgramText(filename, lineno);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	699 if (tmp) {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	700 PyObject_SetAttrString(v, "text", tmp);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	701 Py_DECREF(tmp);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	702 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	703 }
22121 d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	704 if (PyObject_SetAttrString(v, "offset", Py_None)) {
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	705 PyErr_Clear();
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	706 }
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	707 if (exc != PyExc_SyntaxError) {
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	708 if (!PyObject_HasAttrString(v, "msg")) {
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	709 tmp = PyObject_Str(v);
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	710 if (tmp) {
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	711 if (PyObject_SetAttrString(v, "msg", tmp))
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	712 PyErr_Clear();
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	713 Py_DECREF(tmp);
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	714 } else {
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	715 PyErr_Clear();
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	716 }
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	717 }
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	718 if (!PyObject_HasAttrString(v, "print_file_and_line")) {
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	719 if (PyObject_SetAttrString(v, "print_file_and_line",
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	720 Py_None))
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	721 PyErr_Clear();
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	722 }
d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	723 }
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	724 PyErr_Restore(exc, v, tb);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	725 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	726
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	727 /* com_fetch_program_text will attempt to load the line of text that
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	728 the exception refers to. If it fails, it will return NULL but will
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	729 not set an exception.
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	730
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	731 XXX The functionality of this function is quite similar to the
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	732 functionality in tb_displayline() in traceback.c.
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	733 */
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	734
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	735 PyObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 25544 diff changeset	736 PyErr_ProgramText(const char *filename, int lineno)
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	737 {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	738 FILE *fp;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	739 int i;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	740 char linebuf[1000];
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	741
36701 e3248f1fc54d PyErr_ProgramText(): Grrrrrr. Tim Peters <tim.peters@gmail.com> parents: 36521 diff changeset	742 if (filename == NULL \|\| *filename == '\0' \|\| lineno <= 0)
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	743 return NULL;
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22205 diff changeset	744 fp = fopen(filename, "r" PY_STDIOTEXTMODE);
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	745 if (fp == NULL)
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	746 return NULL;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	747 for (i = 0; i < lineno; i++) {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	748 char *pLastChar = &linebuf[sizeof(linebuf) - 2];
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	749 do {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	750 *pLastChar = '\0';
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22205 diff changeset	751 if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, fp, NULL) == NULL)
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	752 break;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	753 /* fgets read something; if it didn't get as
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	754 far as pLastChar, it must have found a newline
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	755 or hit the end of the file; if pLastChar is \n,
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	756 it obviously found a newline; else we haven't
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	757 yet seen a newline, so must continue */
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	758 } while (pLastChar != '\0' && pLastChar != '\n');
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	759 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	760 fclose(fp);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	761 if (i == lineno) {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	762 char *p = linebuf;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	763 while (p == ' ' \|\| p == '\t' \|\| *p == '\014')
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	764 p++;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	765 return PyString_FromString(p);
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	766 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	767 return NULL;
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	768 }

Mercurial > cpython-lru_cache-weakref

annotate Python/errors.c @ 36737:fa92fe15251a legacy-trunk