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

annotate Python/errors.c @ 76379:7a32b9380ffd

Fix #14600. Correct reference handling and naming of ImportError convenience function

author	Brian Curtin <brian@python.org>
date	Tue, 17 Apr 2012 16:57:09 -0500
parents	6825fd9b00ed
children	bf23a6c215f6

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
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	13 #include <windows.h>
b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	14 #include <winbase.h>
10638 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
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	19 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	20 extern "C" {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	21 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	22
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	23
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	25 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	26 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	27 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	28 PyObject oldtype, oldvalue, *oldtraceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	29
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	30 if (traceback != NULL && !PyTraceBack_Check(traceback)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	31 /* XXX Should never happen -- fatal error instead? */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	32 /* Well, it could be None. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	33 Py_DECREF(traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	34 traceback = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	35 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	36
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	37 /* Save these in locals to safeguard against recursive
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	38 invocation through Py_XDECREF */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	39 oldtype = tstate->curexc_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	40 oldvalue = tstate->curexc_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	41 oldtraceback = tstate->curexc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	42
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	43 tstate->curexc_type = type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	44 tstate->curexc_value = value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	45 tstate->curexc_traceback = traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	46
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	47 Py_XDECREF(oldtype);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	48 Py_XDECREF(oldvalue);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	49 Py_XDECREF(oldtraceback);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	50 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	51
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2019 diff changeset	52 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	53 PyErr_SetObject(PyObject exception, PyObject value)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	55 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	56 PyObject *exc_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	57 PyObject *tb = NULL;
47722 7ba7901dad7f Implicit exception chaining via __context__ (PEP 3134). Guido van Rossum <guido@python.org> parents: 46430 diff changeset	58
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	59 if (exception != NULL &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	60 !PyExceptionClass_Check(exception)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	61 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	62 "exception %R not a BaseException subclass",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	63 exception);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	64 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	65 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	66 Py_XINCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	67 exc_value = tstate->exc_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	68 if (exc_value != NULL && exc_value != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	69 /* Implicit exception chaining */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	70 Py_INCREF(exc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	71 if (value == NULL \|\| !PyExceptionInstance_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	72 /* We must normalize the value right now */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	73 PyObject args, fixed_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	74 if (value == NULL \|\| value == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	75 args = PyTuple_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	76 else if (PyTuple_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	77 Py_INCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	78 args = value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	79 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	80 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	81 args = PyTuple_Pack(1, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	82 fixed_value = args ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	83 PyEval_CallObject(exception, args) : NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	84 Py_XDECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	85 Py_XDECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	86 if (fixed_value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	87 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	88 value = fixed_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	89 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	90 /* Avoid reference cycles through the context chain.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	91 This is O(chain length) but context chains are
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	92 usually very short. Sensitive readers may try
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	93 to inline the call to PyException_GetContext. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	94 if (exc_value != value) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	95 PyObject o = exc_value, context;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	96 while ((context = PyException_GetContext(o))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	97 Py_DECREF(context);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	98 if (context == value) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	99 PyException_SetContext(o, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	100 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	101 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	102 o = context;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	103 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	104 PyException_SetContext(value, exc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	105 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	106 Py_DECREF(exc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	107 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	108 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	109 if (value != NULL && PyExceptionInstance_Check(value))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	110 tb = PyException_GetTraceback(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	111 Py_XINCREF(exception);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	112 PyErr_Restore(exception, value, tb);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	113 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	114
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	115 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	116 PyErr_SetNone(PyObject *exception)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	117 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	118 PyErr_SetObject(exception, (PyObject *)NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	119 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	120
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	121 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	122 PyErr_SetString(PyObject exception, const char string)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	123 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	124 PyObject *value = PyUnicode_FromString(string);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	125 PyErr_SetObject(exception, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	126 Py_XDECREF(value);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	127 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	128
1832 79e420805c67 err_clear: clear interpreter stack trace Guido van Rossum <guido@python.org> parents: 1319 diff changeset	129
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	130 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	131 PyErr_Occurred(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	132 {
61555 1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	133 /* If there is no thread state, PyThreadState_GET calls
1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	134 Py_FatalError, which calls PyErr_Occurred. To avoid the
1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	135 resulting infinite loop, we inline PyThreadState_GET here and
1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	136 treat no thread as no error. */
1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	137 PyThreadState *tstate =
1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	138 ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current));
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	139
61555 1698c55b2af9 Make PyErr_Occurred return NULL if there is no current thread. Previously it Jeffrey Yasskin <jyasskin@gmail.com> parents: 61466 diff changeset	140 return tstate == NULL ? NULL : tstate->curexc_type;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	141 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	142
6146 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 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	145 PyErr_GivenExceptionMatches(PyObject err, PyObject exc)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	146 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	147 if (err == NULL \|\| exc == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	148 /* maybe caused by "import exceptions" that failed early on */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	149 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	150 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	151 if (PyTuple_Check(exc)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	152 Py_ssize_t i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	153 n = PyTuple_Size(exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	154 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	155 /* Test recursively */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	156 if (PyErr_GivenExceptionMatches(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	157 err, PyTuple_GET_ITEM(exc, i)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	158 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	159 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	160 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	161 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	162 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	163 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	164 /* err might be an instance, so check its class. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	165 if (PyExceptionInstance_Check(err))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	166 err = PyExceptionInstance_Class(err);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	167
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	168 if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	169 int res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	170 PyObject exception, value, *tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	171 PyErr_Fetch(&exception, &value, &tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	172 /* PyObject_IsSubclass() can recurse and therefore is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	173 not safe (see test_bad_getattr in test.pickletester). */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	174 res = PyType_IsSubtype((PyTypeObject )err, (PyTypeObject )exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	175 /* This function must not fail, so print the error here */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	176 if (res == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	177 PyErr_WriteUnraisable(err);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	178 res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	179 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	180 PyErr_Restore(exception, value, tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	181 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	182 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	183
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	184 return err == exc;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	185 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	186
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	187
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	188 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	189 PyErr_ExceptionMatches(PyObject *exc)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	190 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	191 return PyErr_GivenExceptionMatches(PyErr_Occurred(), exc);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	192 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	193
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	194
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	195 /* 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	196 eval_code2(), do_raise(), and PyErr_Print()
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47722 diff changeset	197
2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47722 diff changeset	198 XXX: should PyErr_NormalizeException() also call
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	199 PyException_SetTraceback() with the resulting value and tb?
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	200 */
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	201 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	202 PyErr_NormalizeException(PyObject exc, PyObject val, PyObject **tb)
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	203 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	204 PyObject type = exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	205 PyObject value = val;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	206 PyObject *inclass = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	207 PyObject *initial_tb = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	208 PyThreadState *tstate = NULL;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	209
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	210 if (type == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	211 /* There was no exception, so nothing to do. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	212 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	213 }
13883 15ad4088a700 Avoid dumping core when PyErr_NormalizeException() is called without Guido van Rossum <guido@python.org> parents: 13658 diff changeset	214
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	215 /* If PyErr_SetNone() was used, the value will have been actually
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	216 set to NULL.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	217 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	218 if (!value) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	219 value = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	220 Py_INCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	221 }
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	222
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	223 if (PyExceptionInstance_Check(value))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	224 inclass = PyExceptionInstance_Class(value);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	225
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	226 /* Normalize the exception so that if the type is a class, the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	227 value will be an instance.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	228 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	229 if (PyExceptionClass_Check(type)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	230 /* if the value was not an instance, or is not an instance
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	231 whose class is (or is derived from) type, then use the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	232 value as an argument to instantiation of the type
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	233 class.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	234 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	235 if (!inclass \|\| !PyObject_IsSubclass(inclass, type)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	236 PyObject args, res;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	237
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	238 if (value == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	239 args = PyTuple_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	240 else if (PyTuple_Check(value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	241 Py_INCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	242 args = value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	243 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	244 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	245 args = PyTuple_Pack(1, value);
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	246
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	247 if (args == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	248 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	249 res = PyEval_CallObject(type, args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	250 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	251 if (res == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	252 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	253 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	254 value = res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	255 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	256 /* if the class of the instance doesn't exactly match the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	257 class of the type, believe the instance
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	258 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	259 else if (inclass != type) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	260 Py_DECREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	261 type = inclass;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	262 Py_INCREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	263 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	264 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	265 *exc = type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	266 *val = value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	267 return;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	268 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	269 Py_DECREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	270 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	271 /* If the new exception doesn't set a traceback and the old
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	272 exception had a traceback, use the old traceback for the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	273 new exception. It's better than nothing.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	274 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	275 initial_tb = *tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	276 PyErr_Fetch(exc, val, tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	277 if (initial_tb != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	278 if (*tb == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	279 *tb = initial_tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	280 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	281 Py_DECREF(initial_tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	282 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	283 /* normalize recursively */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	284 tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	285 if (++tstate->recursion_depth > Py_GetRecursionLimit()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	286 --tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	287 /* throw away the old exception... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	288 Py_DECREF(*exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	289 Py_DECREF(*val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	290 /* ... and use the recursion error instead */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	291 *exc = PyExc_RuntimeError;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	292 *val = PyExc_RecursionErrorInst;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	293 Py_INCREF(*exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	294 Py_INCREF(*val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	295 /* just keeping the old traceback */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	296 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	297 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	298 PyErr_NormalizeException(exc, val, tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	299 --tstate->recursion_depth;
6146 a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	300 }
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	301
a2a1df0ca808 Three new C API functions: Barry Warsaw <barry@python.org> parents: 5979 diff changeset	302
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	303 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	304 PyErr_Fetch(PyObject p_type, PyObject p_value, PyObject **p_traceback)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	305 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	306 PyThreadState *tstate = PyThreadState_GET();
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	307
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	308 *p_type = tstate->curexc_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	309 *p_value = tstate->curexc_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	310 *p_traceback = tstate->curexc_traceback;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5370 diff changeset	311
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	312 tstate->curexc_type = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	313 tstate->curexc_value = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	314 tstate->curexc_traceback = NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	315 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	316
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	317 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	318 PyErr_Clear(void)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	320 PyErr_Restore(NULL, NULL, NULL);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	321 }
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	322
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	323 /* 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	324
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	325 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	326 PyErr_BadArgument(void)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	327 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	328 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	329 "bad argument type for built-in operation");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	330 return 0;
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	331 }
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	332
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	333 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	334 PyErr_NoMemory(void)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	335 {
65690 c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	336 PyErr_SetNone(PyExc_MemoryError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	337 return NULL;
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	338 }
33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	339
5370 1ea1f019268d Quickly renamed. Also removed the long comment explaining why this is Guido van Rossum <guido@python.org> parents: 5318 diff changeset	340 PyObject *
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	341 PyErr_SetFromErrnoWithFilenameObject(PyObject exc, PyObject filenameObject)
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	342 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	343 PyObject *message;
72893 793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	344 PyObject v, args;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	345 int i = errno;
74007 51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	346 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	347 WCHAR *s_buf = NULL;
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	348 #endif /* Unix/Windows */
b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	349
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	350 #ifdef EINTR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	351 if (i == EINTR && PyErr_CheckSignals())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	352 return NULL;
2376 c31eaed7798b rename macstrerror to PyMac_StrError; no EINTR test in CW Guido van Rossum <guido@python.org> parents: 2190 diff changeset	353 #endif
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	354
b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	355 #ifndef MS_WINDOWS
74007 51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	356 if (i != 0) {
51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	357 char *s = strerror(i);
74009 07802351ccad Issue #13560: Locale codec functions use the classic "errors" parameter, Victor Stinner <victor.stinner@haypocalc.com> parents: 74007 diff changeset	358 message = PyUnicode_DecodeLocale(s, "surrogateescape");
74007 51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	359 }
51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	360 else {
51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	361 /* Sometimes errno didn't get set */
51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	362 message = PyUnicode_FromString("Error");
51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73949 diff changeset	363 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	364 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	365 if (i == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	366 message = PyUnicode_FromString("Error"); /* Sometimes errno didn't get set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	367 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	368 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	369 /* Note that the Win32 errors do not lineup with the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	370 errno error. So if the error is in the MSVC error
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	371 table, we use it, otherwise we assume it really _is_
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	372 a Win32 error code
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	373 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	374 if (i > 0 && i < _sys_nerr) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	375 message = PyUnicode_FromString(_sys_errlist[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	376 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	377 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	378 int len = FormatMessageW(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	379 FORMAT_MESSAGE_ALLOCATE_BUFFER \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	380 FORMAT_MESSAGE_FROM_SYSTEM \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	381 FORMAT_MESSAGE_IGNORE_INSERTS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	382 NULL, /* no message source */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	383 i,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	384 MAKELANGID(LANG_NEUTRAL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	385 SUBLANG_DEFAULT),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	386 /* Default language */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	387 (LPWSTR) &s_buf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	388 0, /* size not used */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	389 NULL); /* no args */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	390 if (len==0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	391 /* Only ever seen this in out-of-mem
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	392 situations */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	393 s_buf = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	394 message = PyUnicode_FromFormat("Windows Error 0x%X", i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	395 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	396 /* remove trailing cr/lf and dots */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	397 while (len > 0 && (s_buf[len-1] <= L' ' \|\| s_buf[len-1] == L'.'))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	398 s_buf[--len] = L'\0';
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68257 diff changeset	399 message = PyUnicode_FromWideChar(s_buf, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	400 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	401 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	402 }
22205 f4487350c537 Patch #494045: patches errno and stat to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22121 diff changeset	403 #endif /* Unix/Windows */
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	404
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	405 if (message == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	406 {
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	407 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	408 LocalFree(s_buf);
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	409 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	410 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	411 }
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	412
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	413 if (filenameObject != NULL)
72893 793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	414 args = Py_BuildValue("(iOO)", i, message, filenameObject);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	415 else
72893 793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	416 args = Py_BuildValue("(iO)", i, message);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	417 Py_DECREF(message);
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	418
72893 793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	419 if (args != NULL) {
793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	420 v = PyObject_Call(exc, args, NULL);
793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	421 Py_DECREF(args);
793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	422 if (v != NULL) {
793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	423 PyErr_SetObject((PyObject *) Py_TYPE(v), v);
793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	424 Py_DECREF(v);
793c75177d28 Instantiate the OS-related exception as soon as we raise it, so that Antoine Pitrou <solipsis@pitrou.net> parents: 72879 diff changeset	425 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	426 }
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23029 diff changeset	427 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	428 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	429 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	430 return NULL;
9 33701db4ea55 Adde dconvenience functions. Guido van Rossum <guido@python.org> parents: 6 diff changeset	431 }
10638 df8a1c281ad7 Patch by Christian Tismer for Win32, to use FormatMessage() instead of Guido van Rossum <guido@python.org> parents: 9671 diff changeset	432
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	433
ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	434 PyObject *
42794 84618b2064c1 Add const to some strings that are not modified Neal Norwitz <nnorwitz@gmail.com> parents: 42793 diff changeset	435 PyErr_SetFromErrnoWithFilename(PyObject exc, const char filename)
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	436 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	437 PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	438 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	439 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	440 return result;
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	441 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	442
54129 77cfef596d33 Merged revisions 72698-72699 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 53079 diff changeset	443 #ifdef MS_WINDOWS
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	444 PyObject *
42794 84618b2064c1 Add const to some strings that are not modified Neal Norwitz <nnorwitz@gmail.com> parents: 42793 diff changeset	445 PyErr_SetFromErrnoWithUnicodeFilename(PyObject exc, const Py_UNICODE filename)
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	446 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	447 PyObject *name = filename ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	448 PyUnicode_FromUnicode(filename, wcslen(filename)) :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	449 NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	450 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	451 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	452 return result;
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	453 }
54129 77cfef596d33 Merged revisions 72698-72699 via svnmerge from Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 53079 diff changeset	454 #endif /* MS_WINDOWS */
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	455
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	456 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	457 PyErr_SetFromErrno(PyObject *exc)
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	458 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	459 return PyErr_SetFromErrnoWithFilenameObject(exc, NULL);
8706 ca1c669bb041 PyErr_SetFromErrnoWithFilename(): New function which supports setting Barry Warsaw <barry@python.org> parents: 6789 diff changeset	460 }
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	461
36751 8e04de2480e4 PEP 352 implementation. Creates a new base class, BaseException, which has an Brett Cannon <bcannon@gmail.com> parents: 36737 diff changeset	462 #ifdef MS_WINDOWS
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	463 /* 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	464 PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject(
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	465 PyObject *exc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	466 int ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	467 PyObject *filenameObject)
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	468 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	469 int len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	470 WCHAR s_buf = NULL; / Free via LocalFree */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	471 PyObject *message;
72965 84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	472 PyObject args, v;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	473 DWORD err = (DWORD)ierr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	474 if (err==0) err = GetLastError();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	475 len = FormatMessageW(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	476 /* Error API error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	477 FORMAT_MESSAGE_ALLOCATE_BUFFER \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	478 FORMAT_MESSAGE_FROM_SYSTEM \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	479 FORMAT_MESSAGE_IGNORE_INSERTS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	480 NULL, /* no message source */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	481 err,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	482 MAKELANGID(LANG_NEUTRAL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	483 SUBLANG_DEFAULT), /* Default language */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	484 (LPWSTR) &s_buf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	485 0, /* size not used */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	486 NULL); /* no args */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	487 if (len==0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	488 /* Only seen this in out of mem situations */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	489 message = PyUnicode_FromFormat("Windows Error 0x%X", err);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	490 s_buf = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	491 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	492 /* remove trailing cr/lf and dots */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	493 while (len > 0 && (s_buf[len-1] <= L' ' \|\| s_buf[len-1] == L'.'))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	494 s_buf[--len] = L'\0';
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68257 diff changeset	495 message = PyUnicode_FromWideChar(s_buf, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	496 }
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	497
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	498 if (message == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	499 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	500 LocalFree(s_buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	501 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	502 }
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	503
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72848 diff changeset	504 if (filenameObject == NULL)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72848 diff changeset	505 filenameObject = Py_None;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72848 diff changeset	506 /* This is the constructor signature for passing a Windows error code.
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72848 diff changeset	507 The POSIX translation will be figured out by the constructor. */
72965 84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	508 args = Py_BuildValue("(iOOi)", 0, message, filenameObject, err);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	509 Py_DECREF(message);
43204 b51ac2d2d538 Patch #1075: Use wide API to format error messages. Martin v. Löwis <martin@v.loewis.de> parents: 42794 diff changeset	510
72965 84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	511 if (args != NULL) {
84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	512 v = PyObject_Call(exc, args, NULL);
84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	513 Py_DECREF(args);
84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	514 if (v != NULL) {
84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	515 PyErr_SetObject((PyObject *) Py_TYPE(v), v);
84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	516 Py_DECREF(v);
84aed9ef7aaf Instantiate the OS-related exception as soon as we raise it, so that "except" Victor Stinner <victor.stinner@haypocalc.com> parents: 72926 diff changeset	517 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	518 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	519 LocalFree(s_buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	520 return NULL;
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	521 }
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	522
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	523 PyObject *PyErr_SetExcFromWindowsErrWithFilename(
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	524 PyObject *exc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	525 int ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	526 const char *filename)
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	527 {
67163 5605f6920b63 Issue #10780: PyErr_SetFromWindowsErrWithFilename() and Victor Stinner <victor.stinner@haypocalc.com> parents: 65688 diff changeset	528 PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	529 PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	530 ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	531 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	532 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	533 return ret;
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	534 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	535
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	536 PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename(
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	537 PyObject *exc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	538 int ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	539 const Py_UNICODE *filename)
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	540 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	541 PyObject *name = filename ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	542 PyUnicode_FromUnicode(filename, wcslen(filename)) :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	543 NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	544 PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	545 ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	546 name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	547 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	548 return ret;
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	549 }
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	550
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	551 PyObject PyErr_SetExcFromWindowsErr(PyObject exc, int ierr)
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	552 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	553 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL);
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	554 }
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	555
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	556 PyObject *PyErr_SetFromWindowsErr(int ierr)
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	557 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	558 return PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	559 ierr, NULL);
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	560 }
3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	561 PyObject *PyErr_SetFromWindowsErrWithFilename(
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	562 int ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	563 const char *filename)
24423 3db261a93a5b New functions for extension writers on Windows: Thomas Heller <theller@ctypes.org> parents: 24071 diff changeset	564 {
67163 5605f6920b63 Issue #10780: PyErr_SetFromWindowsErrWithFilename() and Victor Stinner <victor.stinner@haypocalc.com> parents: 65688 diff changeset	565 PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	566 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	567 PyExc_WindowsError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	568 ierr, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	569 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	570 return result;
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	571 }
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	572
861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	573 PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename(
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	574 int ierr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	575 const Py_UNICODE *filename)
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	576 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	577 PyObject *name = filename ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	578 PyUnicode_FromUnicode(filename, wcslen(filename)) :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	579 NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	580 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	581 PyExc_WindowsError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	582 ierr, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	583 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	584 return result;
25535 861065256487 Patch 594001: PEP 277 - Unicode file name support for Windows NT. Mark Hammond <mhammond@skippinet.com.au> parents: 24423 diff changeset	585 }
11801 fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	586 #endif /* MS_WINDOWS */
fe960ad3db65 Patch by Mark Hammond: Guido van Rossum <guido@python.org> parents: 10638 diff changeset	587
76272 6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	588 PyObject *
76379 7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	589 PyErr_SetImportError(PyObject msg, PyObject name, PyObject *path)
76272 6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	590 {
76379 7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	591 PyObject args, kwargs, *error;
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	592
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	593 args = PyTuple_New(1);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	594 if (args == NULL)
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	595 return NULL;
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	596
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	597 kwargs = PyDict_New();
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	598 if (args == NULL)
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	599 return NULL;
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	600
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	601 if (name == NULL)
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	602 name = Py_None;
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	603
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	604 if (path == NULL)
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	605 path = Py_None;
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	606
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	607 Py_INCREF(msg);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	608 PyTuple_SetItem(args, 0, msg);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	609 PyDict_SetItemString(kwargs, "name", name);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	610 PyDict_SetItemString(kwargs, "path", path);
76272 6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	611
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	612 /* args must at least be an empty tuple */
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	613 if (args == NULL)
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	614 args = PyTuple_New(0);
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	615
76379 7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	616 error = PyObject_Call(PyExc_ImportError, args, kwargs);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	617 if (error!= NULL) {
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	618 PyErr_SetObject((PyObject *) Py_TYPE(error), error);
7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	619 Py_DECREF(error);
76272 6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	620 }
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	621
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	622 Py_DECREF(args);
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	623 Py_DECREF(kwargs);
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	624
76379 7a32b9380ffd Fix #14600. Correct reference handling and naming of ImportError convenience function Brian Curtin <brian@python.org> parents: 76272 diff changeset	625 return NULL;
76272 6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	626 }
6825fd9b00ed Issue #1559549: Add 'name' and 'path' attributes to ImportError. Brett Cannon <brett@python.org> parents: 74009 diff changeset	627
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	628 void
42794 84618b2064c1 Add const to some strings that are not modified Neal Norwitz <nnorwitz@gmail.com> parents: 42793 diff changeset	629 _PyErr_BadInternalCall(const char *filename, int lineno)
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	630 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	631 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	632 "%s:%d: bad argument to internal function",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	633 filename, lineno);
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	634 }
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	635
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	636 /* 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	637 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	638 #undef PyErr_BadInternalCall
019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	639 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13578 diff changeset	640 PyErr_BadInternalCall(void)
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	641 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	642 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	643 "bad argument to internal function");
22 2d3eb717a00d Added err_badcall(). Guido van Rossum <guido@python.org> parents: 9 diff changeset	644 }
14170 019265b3a856 Improve the exceptions raised by PyErr_BadInternalCall(); adding the Fred Drake <fdrake@acm.org> parents: 14066 diff changeset	645 #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	646
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	647
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	648
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	649 PyObject *
00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	650 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	651 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	652 va_list vargs;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	653 PyObject* string;
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	654
951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	655 #ifdef HAVE_STDARG_PROTOTYPES
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	656 va_start(vargs, format);
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	657 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	658 va_start(vargs);
14335 951eb3af3494 code part of patch #100895 by Fredrik Lundh Jeremy Hylton <jeremy@alum.mit.edu> parents: 14330 diff changeset	659 #endif
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	660
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	661 string = PyUnicode_FromFormatV(format, vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	662 PyErr_SetObject(exception, string);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	663 Py_XDECREF(string);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	664 va_end(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	665 return NULL;
5105 00fd6857f76b Added convenience function PyErr_Format(exception, formatstring, ...) -> NULL. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	666 }
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	667
b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	668
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	669
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	670 PyObject *
42794 84618b2064c1 Add const to some strings that are not modified Neal Norwitz <nnorwitz@gmail.com> parents: 42793 diff changeset	671 PyErr_NewException(const 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	672 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	673 const char *dot;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	674 PyObject *modulename = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	675 PyObject *classname = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	676 PyObject *mydict = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	677 PyObject *bases = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	678 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	679 dot = strrchr(name, '.');
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	680 if (dot == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	681 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	682 "PyErr_NewException: name must be module.class");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	683 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	684 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	685 if (base == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	686 base = PyExc_Exception;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	687 if (dict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	688 dict = mydict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	689 if (dict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	690 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	691 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	692 if (PyDict_GetItemString(dict, "__module__") == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	693 modulename = PyUnicode_FromStringAndSize(name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	694 (Py_ssize_t)(dot-name));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	695 if (modulename == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	696 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	697 if (PyDict_SetItemString(dict, "__module__", modulename) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	698 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	699 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	700 if (PyTuple_Check(base)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	701 bases = base;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	702 /* INCREF as we create a new ref in the else branch */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	703 Py_INCREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	704 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	705 bases = PyTuple_Pack(1, base);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	706 if (bases == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	707 goto failure;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	708 }
73949 021e5bb297d1 Issue #13575: there is only one class type. Florent Xicluna <florent.xicluna@gmail.com> parents: 72965 diff changeset	709 /* Create a real class. */
62155 600c23127207 Issue #8848: U / U# formats of Py_BuildValue() are just alias to s / s# Victor Stinner <victor.stinner@haypocalc.com> parents: 61555 diff changeset	710 result = PyObject_CallFunction((PyObject *)&PyType_Type, "sOO",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	711 dot+1, bases, 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	712 failure:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	713 Py_XDECREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	714 Py_XDECREF(mydict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	715 Py_XDECREF(classname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	716 Py_XDECREF(modulename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	717 return result;
6319 b7f0b98f5325 New API PyErr_NewException(name, base, dict) to create simple new exceptions. Guido van Rossum <guido@python.org> parents: 6190 diff changeset	718 }
14330 6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	719
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	720
c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	721 /* Create an exception with docstring */
c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	722 PyObject *
c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	723 PyErr_NewExceptionWithDoc(const char name, const char doc,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	724 PyObject base, PyObject dict)
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	725 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	726 int result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	727 PyObject *ret = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	728 PyObject mydict = NULL; / points to the dict only if we create it */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	729 PyObject *docobj;
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	730
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	731 if (dict == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	732 dict = mydict = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	733 if (dict == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	734 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	735 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	736 }
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	737
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	738 if (doc != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	739 docobj = PyUnicode_FromString(doc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	740 if (docobj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	741 goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	742 result = PyDict_SetItemString(dict, "__doc__", docobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	743 Py_DECREF(docobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	744 if (result < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	745 goto failure;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	746 }
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	747
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	748 ret = PyErr_NewException(name, base, dict);
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	749 failure:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	750 Py_XDECREF(mydict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61384 diff changeset	751 return ret;
57962 c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	752 }
c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	753
c1972eef3579 Merged revisions 77088 via svnmerge from Georg Brandl <georg@python.org> parents: 54129 diff changeset	754
14330 6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	755 /* 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	756 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	757 void
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	758 PyErr_WriteUnraisable(PyObject *obj)
6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	759 {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72893 diff changeset	760 _Py_IDENTIFIER(__module__);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	761 PyObject f, t, v, tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	762 PyErr_Fetch(&t, &v, &tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	763 f = PySys_GetObject("stderr");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	764 if (f != NULL && f != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	765 PyFile_WriteString("Exception ", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	766 if (t) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	767 PyObject* moduleName;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	768 char* className;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	769 assert(PyExceptionClass_Check(t));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	770 className = PyExceptionClass_Name(t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	771 if (className != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	772 char *dot = strrchr(className, '.');
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	773 if (dot != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	774 className = dot+1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	775 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	776
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	777 moduleName = _PyObject_GetAttrId(t, &PyId___module__);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	778 if (moduleName == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	779 PyFile_WriteString("<unknown>", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	780 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	781 char* modstr = _PyUnicode_AsString(moduleName);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	782 if (modstr &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	783 strcmp(modstr, "builtins") != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	784 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	785 PyFile_WriteString(modstr, f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	786 PyFile_WriteString(".", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	787 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	788 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	789 if (className == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	790 PyFile_WriteString("<unknown>", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	791 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	792 PyFile_WriteString(className, f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	793 if (v && v != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	794 PyFile_WriteString(": ", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	795 PyFile_WriteObject(v, f, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	796 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	797 Py_XDECREF(moduleName);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	798 }
65624 39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 65482 diff changeset	799 if (obj) {
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 65482 diff changeset	800 PyFile_WriteString(" in ", f);
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 65482 diff changeset	801 PyFile_WriteObject(obj, f, 0);
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 65482 diff changeset	802 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	803 PyFile_WriteString(" ignored\n", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	804 PyErr_Clear(); /* Just in case */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	805 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	806 Py_XDECREF(t);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	807 Py_XDECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	808 Py_XDECREF(tb);
14330 6dee1985c681 refactor __del__ exception handler into PyErr_WriteUnraisable Jeremy Hylton <jeremy@alum.mit.edu> parents: 14170 diff changeset	809 }
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	810
30781 74747f62f286 Made function declaration a proper C prototype Armin Rigo <arigo@tunes.org> parents: 30683 diff changeset	811 extern PyObject *PyModule_GetWarningsModule(void);
15591 36286632ff3a Add PyErr_Warn(). Guido van Rossum <guido@python.org> parents: 15318 diff changeset	812
16850 2d4da6cfee61 Add PyErr_WarnExplicit(), which calls warnings.warn_explicit(), with Guido van Rossum <guido@python.org> parents: 16838 diff changeset	813
64859 00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	814 void
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	815 PyErr_SyntaxLocation(const char *filename, int lineno) {
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	816 PyErr_SyntaxLocationEx(filename, lineno, -1);
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	817 }
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	818
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	819
22121 d4406fbfcb4e Patch #50002: Display line information for bad \x escapes: Martin v. Löwis <martin@v.loewis.de> parents: 20221 diff changeset	820 /* 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	821 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	822 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	823
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	824 void
64859 00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	825 PyErr_SyntaxLocationEx(const char *filename, int lineno, int col_offset)
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	826 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	827 PyObject exc, v, tb, tmp;
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	828 _Py_IDENTIFIER(filename);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	829 _Py_IDENTIFIER(lineno);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	830 _Py_IDENTIFIER(msg);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	831 _Py_IDENTIFIER(offset);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	832 _Py_IDENTIFIER(print_file_and_line);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	833 _Py_IDENTIFIER(text);
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	834
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	835 /* add attributes for the line number and filename for the error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	836 PyErr_Fetch(&exc, &v, &tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	837 PyErr_NormalizeException(&exc, &v, &tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	838 /* XXX check that it is, indeed, a syntax error. It might not
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	839 * be, though. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	840 tmp = PyLong_FromLong(lineno);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	841 if (tmp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	842 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	843 else {
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	844 if (_PyObject_SetAttrId(v, &PyId_lineno, tmp))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	845 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	846 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	847 }
64859 00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	848 if (col_offset >= 0) {
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	849 tmp = PyLong_FromLong(col_offset);
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	850 if (tmp == NULL)
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	851 PyErr_Clear();
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	852 else {
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	853 if (_PyObject_SetAttrId(v, &PyId_offset, tmp))
64859 00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	854 PyErr_Clear();
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	855 Py_DECREF(tmp);
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	856 }
00e4ce31d404 add PyErr_SyntaxLocationEx, to support adding a column offset Benjamin Peterson <benjamin@python.org> parents: 62155 diff changeset	857 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	858 if (filename != NULL) {
65482 38ad57db88ac PyErr_SyntaxLocationEx() uses PyUnicode_DecodeFSDefault(), instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 64859 diff changeset	859 tmp = PyUnicode_DecodeFSDefault(filename);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	860 if (tmp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	861 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	862 else {
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	863 if (_PyObject_SetAttrId(v, &PyId_filename, tmp))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	864 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	865 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	866 }
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	867
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	868 tmp = PyErr_ProgramText(filename, lineno);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	869 if (tmp) {
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	870 if (_PyObject_SetAttrId(v, &PyId_text, tmp))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	871 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	872 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	873 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	874 }
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	875 if (_PyObject_SetAttrId(v, &PyId_offset, Py_None)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	876 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	877 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	878 if (exc != PyExc_SyntaxError) {
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	879 if (!_PyObject_HasAttrId(v, &PyId_msg)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	880 tmp = PyObject_Str(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	881 if (tmp) {
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	882 if (_PyObject_SetAttrId(v, &PyId_msg, tmp))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	883 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	884 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	885 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	886 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	887 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	888 }
72926 db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	889 if (!_PyObject_HasAttrId(v, &PyId_print_file_and_line)) {
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	890 if (_PyObject_SetAttrId(v, &PyId_print_file_and_line,
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	891 Py_None))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	892 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	893 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	894 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	895 PyErr_Restore(exc, v, tb);
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	896 }
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	897
43524 2f30bfb7c738 Minor cleanup of the comment for PyErr_ProgramText() and a tweak to the code Guido van Rossum <guido@python.org> parents: 43292 diff changeset	898 /* Attempt to load the line of text that the exception refers to. If it
2f30bfb7c738 Minor cleanup of the comment for PyErr_ProgramText() and a tweak to the code Guido van Rossum <guido@python.org> parents: 43292 diff changeset	899 fails, it will return NULL but will not set an exception.
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	900
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	901 XXX The functionality of this function is quite similar to the
43524 2f30bfb7c738 Minor cleanup of the comment for PyErr_ProgramText() and a tweak to the code Guido van Rossum <guido@python.org> parents: 43292 diff changeset	902 functionality in tb_displayline() in traceback.c. */
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	903
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	904 PyObject *
26601 cc05c2c8660e Constify filenames and scripts. Fixes #651362. Martin v. Löwis <martin@v.loewis.de> parents: 25544 diff changeset	905 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	906 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	907 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	908 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	909 char linebuf[1000];
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	910
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	911 if (filename == NULL \|\| *filename == '\0' \|\| lineno <= 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	912 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	913 fp = fopen(filename, "r" PY_STDIOTEXTMODE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	914 if (fp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	915 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	916 for (i = 0; i < lineno; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	917 char *pLastChar = &linebuf[sizeof(linebuf) - 2];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	918 do {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	919 *pLastChar = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	920 if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	921 fp, NULL) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	922 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	923 /* fgets read something; if it didn't get as
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	924 far as pLastChar, it must have found a newline
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	925 or hit the end of the file; if pLastChar is \n,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	926 it obviously found a newline; else we haven't
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	927 yet seen a newline, so must continue */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	928 } while (pLastChar != '\0' && pLastChar != '\n');
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	929 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	930 fclose(fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	931 if (i == lineno) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	932 char *p = linebuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	933 PyObject *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	934 while (p == ' ' \|\| p == '\t' \|\| *p == '\014')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	935 p++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	936 res = PyUnicode_FromString(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	937 if (res == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	938 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	939 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	940 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54129 diff changeset	941 return NULL;
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 15591 diff changeset	942 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	943
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	944 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	945 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37871 diff changeset	946 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/errors.c @ 76379:7a32b9380ffd