cpython-lru_cache-weakref: Objects/exceptions.c annotate

annotate Objects/exceptions.c @ 74588:dfd05348331c

Sort functions in the doc of the time module Move wallclock() at the end.

author	Victor Stinner <victor.stinner@haypocalc.com>
date	Tue, 24 Jan 2012 01:12:54 +0100
parents	44d8aa3c1003
children	50901238ad29

rev	line source
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1 /*
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2 * New exceptions.c written in Iceland by Richard Jones and Georg Brandl.
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3 *
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	4 * Thanks go to Tim Peters and Michael Hudson for debugging.
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	5 */
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	6
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	7 #define PY_SSIZE_T_CLEAN
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	8 #include <Python.h>
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	9 #include "structmember.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	10 #include "osdefs.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	11
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	12
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	13 /* Compatibility aliases */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	14 PyObject *PyExc_EnvironmentError = NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	15 PyObject *PyExc_IOError = NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	16 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	17 PyObject *PyExc_WindowsError = NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	18 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	19 #ifdef __VMS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	20 PyObject *PyExc_VMSError = NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	21 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	22
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	23 /* The dict map from errno codes to OSError subclasses */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	24 static PyObject *errnomap = NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	25
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	26
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	27 /* NOTE: If the exception class hierarchy changes, don't forget to update
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	28 * Lib/test/exception_hierarchy.txt
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	29 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	30
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	31 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	32 * BaseException
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	33 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	34 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	35 BaseException_new(PyTypeObject type, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	36 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	37 PyBaseExceptionObject *self;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	38
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	39 self = (PyBaseExceptionObject *)type->tp_alloc(type, 0);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41501 diff changeset	40 if (!self)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41501 diff changeset	41 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	42 /* the dict is created on the fly in PyObject_GenericSetAttr */
41749 b085eb66b7f6 Merged revisions 55342-55406 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	43 self->dict = NULL;
43188 386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	44 self->traceback = self->cause = self->context = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	45
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	46 self->args = PyTuple_New(0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	47 if (!self->args) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	48 Py_DECREF(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	49 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	50 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	51
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	52 return (PyObject *)self;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	53 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	54
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	55 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	56 BaseException_init(PyBaseExceptionObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	57 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	58 if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds))
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	59 return -1;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	60
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	61 Py_XDECREF(self->args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	62 self->args = args;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	63 Py_INCREF(self->args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	64
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	65 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	66 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	67
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	68 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	69 BaseException_clear(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	70 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	71 Py_CLEAR(self->dict);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	72 Py_CLEAR(self->args);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	73 Py_CLEAR(self->traceback);
43188 386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	74 Py_CLEAR(self->cause);
386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	75 Py_CLEAR(self->context);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	76 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	77 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	78
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	79 static void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	80 BaseException_dealloc(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	81 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	82 _PyObject_GC_UNTRACK(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	83 BaseException_clear(self);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	84 Py_TYPE(self)->tp_free((PyObject *)self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	85 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	86
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	87 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	88 BaseException_traverse(PyBaseExceptionObject self, visitproc visit, void arg)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	89 {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	90 Py_VISIT(self->dict);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	91 Py_VISIT(self->args);
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	92 Py_VISIT(self->traceback);
43188 386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	93 Py_VISIT(self->cause);
386c22d93ab6 Fix refleaks exposed by test_raise. Collin Winter <collinw@gmail.com> parents: 43102 diff changeset	94 Py_VISIT(self->context);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	95 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	96 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	97
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	98 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	99 BaseException_str(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	100 {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	101 switch (PyTuple_GET_SIZE(self->args)) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	102 case 0:
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	103 return PyUnicode_FromString("");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	104 case 1:
43866 8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the Thomas Heller <theller@ctypes.org> parents: 43777 diff changeset	105 return PyObject_Str(PyTuple_GET_ITEM(self->args, 0));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	106 default:
43866 8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the Thomas Heller <theller@ctypes.org> parents: 43777 diff changeset	107 return PyObject_Str(self->args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	108 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	109 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	110
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	111 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	112 BaseException_repr(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	113 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	114 char *name;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	115 char *dot;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	116
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	117 name = (char *)Py_TYPE(self)->tp_name;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	118 dot = strrchr(name, '.');
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	119 if (dot != NULL) name = dot+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	120
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	121 return PyUnicode_FromFormat("%s%R", name, self->args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	122 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	123
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	124 /* Pickling support */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	125 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	126 BaseException_reduce(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	127 {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	128 if (self->args && self->dict)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	129 return PyTuple_Pack(3, Py_TYPE(self), self->args, self->dict);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	130 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	131 return PyTuple_Pack(2, Py_TYPE(self), self->args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	132 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	133
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	134 /*
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	135 * Needed for backward compatibility, since exceptions used to store
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	136 * all their attributes in the __dict__. Code is taken from cPickle's
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	137 * load_build function.
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	138 */
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	139 static PyObject *
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	140 BaseException_setstate(PyObject self, PyObject state)
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	141 {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	142 PyObject d_key, d_value;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	143 Py_ssize_t i = 0;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	144
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	145 if (state != Py_None) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	146 if (!PyDict_Check(state)) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	147 PyErr_SetString(PyExc_TypeError, "state is not a dictionary");
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	148 return NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	149 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	150 while (PyDict_Next(state, &i, &d_key, &d_value)) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	151 if (PyObject_SetAttr(self, d_key, d_value) < 0)
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	152 return NULL;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	153 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	154 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	155 Py_RETURN_NONE;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	156 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	157
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	158 static PyObject *
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	159 BaseException_with_traceback(PyObject self, PyObject tb) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	160 if (PyException_SetTraceback(self, tb))
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	161 return NULL;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	162
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	163 Py_INCREF(self);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	164 return self;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	165 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	166
46682 91d5f0841700 Give with_traceback a docstring. Georg Brandl <georg@python.org> parents: 44351 diff changeset	167 PyDoc_STRVAR(with_traceback_doc,
91d5f0841700 Give with_traceback a docstring. Georg Brandl <georg@python.org> parents: 44351 diff changeset	168 "Exception.with_traceback(tb) --\n\
91d5f0841700 Give with_traceback a docstring. Georg Brandl <georg@python.org> parents: 44351 diff changeset	169 set self.__traceback__ to tb and return self.");
91d5f0841700 Give with_traceback a docstring. Georg Brandl <georg@python.org> parents: 44351 diff changeset	170
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	171
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	172 static PyMethodDef BaseException_methods[] = {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	173 {"__reduce__", (PyCFunction)BaseException_reduce, METH_NOARGS },
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	174 {"__setstate__", (PyCFunction)BaseException_setstate, METH_O },
46682 91d5f0841700 Give with_traceback a docstring. Georg Brandl <georg@python.org> parents: 44351 diff changeset	175 {"with_traceback", (PyCFunction)BaseException_with_traceback, METH_O,
91d5f0841700 Give with_traceback a docstring. Georg Brandl <georg@python.org> parents: 44351 diff changeset	176 with_traceback_doc},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	177 {NULL, NULL, 0, NULL},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	178 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	179
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	180
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	181 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	182 BaseException_get_dict(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	183 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	184 if (self->dict == NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	185 self->dict = PyDict_New();
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	186 if (!self->dict)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	187 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	188 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	189 Py_INCREF(self->dict);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	190 return self->dict;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	191 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	192
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	193 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	194 BaseException_set_dict(PyBaseExceptionObject self, PyObject val)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	195 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	196 if (val == NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	197 PyErr_SetString(PyExc_TypeError, "__dict__ may not be deleted");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	198 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	199 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	200 if (!PyDict_Check(val)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	201 PyErr_SetString(PyExc_TypeError, "__dict__ must be a dictionary");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	202 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	203 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	204 Py_CLEAR(self->dict);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	205 Py_INCREF(val);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	206 self->dict = val;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	207 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	208 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	209
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	210 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	211 BaseException_get_args(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	212 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	213 if (self->args == NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	214 Py_INCREF(Py_None);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	215 return Py_None;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	216 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	217 Py_INCREF(self->args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	218 return self->args;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	219 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	220
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	221 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	222 BaseException_set_args(PyBaseExceptionObject self, PyObject val)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	223 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	224 PyObject *seq;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	225 if (val == NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	226 PyErr_SetString(PyExc_TypeError, "args may not be deleted");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	227 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	228 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	229 seq = PySequence_Tuple(val);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	230 if (!seq) return -1;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	231 Py_CLEAR(self->args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	232 self->args = seq;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	233 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	234 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	235
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	236 static PyObject *
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	237 BaseException_get_tb(PyBaseExceptionObject *self)
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	238 {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	239 if (self->traceback == NULL) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	240 Py_INCREF(Py_None);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	241 return Py_None;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	242 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	243 Py_INCREF(self->traceback);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	244 return self->traceback;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	245 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	246
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	247 static int
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	248 BaseException_set_tb(PyBaseExceptionObject self, PyObject tb)
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	249 {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	250 if (tb == NULL) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	251 PyErr_SetString(PyExc_TypeError, "__traceback__ may not be deleted");
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	252 return -1;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	253 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	254 else if (!(tb == Py_None \|\| PyTraceBack_Check(tb))) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	255 PyErr_SetString(PyExc_TypeError,
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	256 "__traceback__ must be a traceback or None");
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	257 return -1;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	258 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	259
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	260 Py_XINCREF(tb);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	261 Py_XDECREF(self->traceback);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	262 self->traceback = tb;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	263 return 0;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	264 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	265
52509 d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	266 static PyObject *
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	267 BaseException_get_context(PyObject *self) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	268 PyObject *res = PyException_GetContext(self);
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	269 if (res) return res; /* new reference already returned above */
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	270 Py_RETURN_NONE;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	271 }
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	272
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	273 static int
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	274 BaseException_set_context(PyObject self, PyObject arg) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	275 if (arg == NULL) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	276 PyErr_SetString(PyExc_TypeError, "__context__ may not be deleted");
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	277 return -1;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	278 } else if (arg == Py_None) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	279 arg = NULL;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	280 } else if (!PyExceptionInstance_Check(arg)) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	281 PyErr_SetString(PyExc_TypeError, "exception context must be None "
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	282 "or derive from BaseException");
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	283 return -1;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	284 } else {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	285 /* PyException_SetContext steals this reference */
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	286 Py_INCREF(arg);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59128 diff changeset	287 }
52509 d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	288 PyException_SetContext(self, arg);
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	289 return 0;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	290 }
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	291
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	292 static PyObject *
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	293 BaseException_get_cause(PyObject *self) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	294 PyObject *res = PyException_GetCause(self);
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	295 if (res) return res; /* new reference already returned above */
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	296 Py_RETURN_NONE;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	297 }
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	298
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	299 static int
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	300 BaseException_set_cause(PyObject self, PyObject arg) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	301 if (arg == NULL) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	302 PyErr_SetString(PyExc_TypeError, "__cause__ may not be deleted");
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	303 return -1;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	304 } else if (arg == Py_None) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	305 arg = NULL;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	306 } else if (!PyExceptionInstance_Check(arg)) {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	307 PyErr_SetString(PyExc_TypeError, "exception cause must be None "
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	308 "or derive from BaseException");
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	309 return -1;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	310 } else {
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	311 /* PyException_SetCause steals this reference */
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	312 Py_INCREF(arg);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59128 diff changeset	313 }
52509 d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	314 PyException_SetCause(self, arg);
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	315 return 0;
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	316 }
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	317
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41611 diff changeset	318
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	319 static PyGetSetDef BaseException_getset[] = {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	320 {"__dict__", (getter)BaseException_get_dict, (setter)BaseException_set_dict},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	321 {"args", (getter)BaseException_get_args, (setter)BaseException_set_args},
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	322 {"__traceback__", (getter)BaseException_get_tb, (setter)BaseException_set_tb},
52509 d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	323 {"__context__", (getter)BaseException_get_context,
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	324 (setter)BaseException_set_context, PyDoc_STR("exception context")},
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	325 {"__cause__", (getter)BaseException_get_cause,
d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	326 (setter)BaseException_set_cause, PyDoc_STR("exception cause")},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	327 {NULL},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	328 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	329
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	330
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	331 PyObject *
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	332 PyException_GetTraceback(PyObject *self) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	333 PyBaseExceptionObject base_self = (PyBaseExceptionObject )self;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	334 Py_XINCREF(base_self->traceback);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	335 return base_self->traceback;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	336 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	337
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	338
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	339 int
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	340 PyException_SetTraceback(PyObject self, PyObject tb) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	341 return BaseException_set_tb((PyBaseExceptionObject *)self, tb);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	342 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	343
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	344 PyObject *
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	345 PyException_GetCause(PyObject *self) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	346 PyObject cause = ((PyBaseExceptionObject )self)->cause;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	347 Py_XINCREF(cause);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	348 return cause;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	349 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	350
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	351 /* Steals a reference to cause */
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	352 void
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	353 PyException_SetCause(PyObject self, PyObject cause) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	354 PyObject old_cause = ((PyBaseExceptionObject )self)->cause;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	355 ((PyBaseExceptionObject *)self)->cause = cause;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	356 Py_XDECREF(old_cause);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	357 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	358
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	359 PyObject *
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	360 PyException_GetContext(PyObject *self) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	361 PyObject context = ((PyBaseExceptionObject )self)->context;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	362 Py_XINCREF(context);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	363 return context;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	364 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	365
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	366 /* Steals a reference to context */
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	367 void
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	368 PyException_SetContext(PyObject self, PyObject context) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	369 PyObject old_context = ((PyBaseExceptionObject )self)->context;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	370 ((PyBaseExceptionObject *)self)->context = context;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	371 Py_XDECREF(old_context);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	372 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	373
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42855 diff changeset	374
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	375 static PyTypeObject _PyExc_BaseException = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	376 PyVarObject_HEAD_INIT(NULL, 0)
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	377 "BaseException", /tp_name/
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	378 sizeof(PyBaseExceptionObject), /tp_basicsize/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	379 0, /tp_itemsize/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	380 (destructor)BaseException_dealloc, /tp_dealloc/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	381 0, /tp_print/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	382 0, /tp_getattr/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	383 0, /tp_setattr/
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	384 0, /* tp_reserved; */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	385 (reprfunc)BaseException_repr, /tp_repr/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	386 0, /tp_as_number/
40959 0ea52558bdfe Remove the ability to slice/index on exceptions per PEP 352. Brett Cannon <bcannon@gmail.com> parents: 40949 diff changeset	387 0, /tp_as_sequence/
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	388 0, /tp_as_mapping/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	389 0, /tp_hash /
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	390 0, /tp_call/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	391 (reprfunc)BaseException_str, /tp_str/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	392 PyObject_GenericGetAttr, /tp_getattro/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	393 PyObject_GenericSetAttr, /tp_setattro/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	394 0, /tp_as_buffer/
40909 f2f0b41f270d Merged revisions 53875-53911 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	395 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC \|
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59128 diff changeset	396 Py_TPFLAGS_BASE_EXC_SUBCLASS, /tp_flags/
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	397 PyDoc_STR("Common base class for all exceptions"), /* tp_doc */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	398 (traverseproc)BaseException_traverse, /* tp_traverse */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	399 (inquiry)BaseException_clear, /* tp_clear */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	400 0, /* tp_richcompare */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	401 0, /* tp_weaklistoffset */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	402 0, /* tp_iter */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	403 0, /* tp_iternext */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	404 BaseException_methods, /* tp_methods */
52509 d12b02abe6dc Fix segfaults when running test_exceptions with coverage tracing, caused by wrongly defining Exception.__context__ as a T_OBJECT structmember which does not set the member to NULL on None assignment, and generally does not do type checks. This could be used to crash the interpreter by setting any object to __context__. The same applies to __cause__. Also document the PyException_* functions. Georg Brandl <georg@python.org> parents: 51579 diff changeset	405 0, /* tp_members */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	406 BaseException_getset, /* tp_getset */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	407 0, /* tp_base */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	408 0, /* tp_dict */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	409 0, /* tp_descr_get */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	410 0, /* tp_descr_set */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	411 offsetof(PyBaseExceptionObject, dict), /* tp_dictoffset */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	412 (initproc)BaseException_init, /* tp_init */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	413 0, /* tp_alloc */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	414 BaseException_new, /* tp_new */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	415 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	416 /* the CPython API expects exceptions to be (PyObject *) - both a hold-over
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	417 from the previous implmentation and also allowing Python objects to be used
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	418 in the API */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	419 PyObject PyExc_BaseException = (PyObject )&_PyExc_BaseException;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	420
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	421 /* note these macros omit the last semicolon so the macro invocation may
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	422 * include it and not look strange.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	423 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	424 #define SimpleExtendsException(EXCBASE, EXCNAME, EXCDOC) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	425 static PyTypeObject _PyExc_ ## EXCNAME = { \
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	426 PyVarObject_HEAD_INIT(NULL, 0) \
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	427 # EXCNAME, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	428 sizeof(PyBaseExceptionObject), \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	429 0, (destructor)BaseException_dealloc, 0, 0, 0, 0, 0, 0, 0, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	430 0, 0, 0, 0, 0, 0, 0, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	431 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	432 PyDoc_STR(EXCDOC), (traverseproc)BaseException_traverse, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	433 (inquiry)BaseException_clear, 0, 0, 0, 0, 0, 0, 0, &_ ## EXCBASE, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	434 0, 0, 0, offsetof(PyBaseExceptionObject, dict), \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	435 (initproc)BaseException_init, 0, BaseException_new,\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	436 }; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	437 PyObject PyExc_ ## EXCNAME = (PyObject )&_PyExc_ ## EXCNAME
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	438
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	439 #define MiddlingExtendsException(EXCBASE, EXCNAME, EXCSTORE, EXCDOC) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	440 static PyTypeObject _PyExc_ ## EXCNAME = { \
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	441 PyVarObject_HEAD_INIT(NULL, 0) \
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	442 # EXCNAME, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	443 sizeof(Py ## EXCSTORE ## Object), \
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	444 0, (destructor)EXCSTORE ## _dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	445 0, 0, 0, 0, 0, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	446 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC, \
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	447 PyDoc_STR(EXCDOC), (traverseproc)EXCSTORE ## _traverse, \
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	448 (inquiry)EXCSTORE ## _clear, 0, 0, 0, 0, 0, 0, 0, &_ ## EXCBASE, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	449 0, 0, 0, offsetof(Py ## EXCSTORE ## Object, dict), \
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	450 (initproc)EXCSTORE ## _init, 0, 0, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	451 }; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	452 PyObject PyExc_ ## EXCNAME = (PyObject )&_PyExc_ ## EXCNAME
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	453
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	454 #define ComplexExtendsException(EXCBASE, EXCNAME, EXCSTORE, EXCNEW, \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	455 EXCMETHODS, EXCMEMBERS, EXCGETSET, \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	456 EXCSTR, EXCDOC) \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	457 static PyTypeObject _PyExc_ ## EXCNAME = { \
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	458 PyVarObject_HEAD_INIT(NULL, 0) \
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	459 # EXCNAME, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	460 sizeof(Py ## EXCSTORE ## Object), 0, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	461 (destructor)EXCSTORE ## _dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	462 (reprfunc)EXCSTR, 0, 0, 0, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	463 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	464 PyDoc_STR(EXCDOC), (traverseproc)EXCSTORE ## _traverse, \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	465 (inquiry)EXCSTORE ## _clear, 0, 0, 0, 0, EXCMETHODS, \
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	466 EXCMEMBERS, EXCGETSET, &_ ## EXCBASE, \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	467 0, 0, 0, offsetof(Py ## EXCSTORE ## Object, dict), \
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	468 (initproc)EXCSTORE ## _init, 0, EXCNEW,\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	469 }; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	470 PyObject PyExc_ ## EXCNAME = (PyObject )&_PyExc_ ## EXCNAME
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	471
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	472
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	473 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	474 * Exception extends BaseException
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	475 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	476 SimpleExtendsException(PyExc_BaseException, Exception,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	477 "Common base class for all non-exit exceptions.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	478
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	479
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	480 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	481 * TypeError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	482 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	483 SimpleExtendsException(PyExc_Exception, TypeError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	484 "Inappropriate argument type.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	485
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	486
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	487 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	488 * StopIteration extends Exception
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	489 */
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	490
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	491 static PyMemberDef StopIteration_members[] = {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	492 {"value", T_OBJECT, offsetof(PyStopIterationObject, value), 0,
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	493 PyDoc_STR("generator return value")},
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	494 {NULL} /* Sentinel */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	495 };
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	496
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	497 static int
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	498 StopIteration_init(PyStopIterationObject self, PyObject args, PyObject *kwds)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	499 {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	500 Py_ssize_t size = PyTuple_GET_SIZE(args);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	501 PyObject *value;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	502
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	503 if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	504 return -1;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	505 Py_CLEAR(self->value);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	506 if (size > 0)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	507 value = PyTuple_GET_ITEM(args, 0);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	508 else
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	509 value = Py_None;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	510 Py_INCREF(value);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	511 self->value = value;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	512 return 0;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	513 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	514
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	515 static int
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	516 StopIteration_clear(PyStopIterationObject *self)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	517 {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	518 Py_CLEAR(self->value);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	519 return BaseException_clear((PyBaseExceptionObject *)self);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	520 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	521
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	522 static void
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	523 StopIteration_dealloc(PyStopIterationObject *self)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	524 {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	525 _PyObject_GC_UNTRACK(self);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	526 StopIteration_clear(self);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	527 Py_TYPE(self)->tp_free((PyObject *)self);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	528 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	529
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	530 static int
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	531 StopIteration_traverse(PyStopIterationObject self, visitproc visit, void arg)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	532 {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	533 Py_VISIT(self->value);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	534 return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	535 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	536
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	537 PyObject *
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	538 PyStopIteration_Create(PyObject *value)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	539 {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	540 return PyObject_CallFunctionObjArgs(PyExc_StopIteration, value, NULL);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	541 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	542
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	543 ComplexExtendsException(
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	544 PyExc_Exception, /* base */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	545 StopIteration, /* name */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	546 StopIteration, /* prefix for _init, etc /
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	547 0, /* new */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	548 0, /* methods */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	549 StopIteration_members, /* members */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	550 0, /* getset */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	551 0, /* str */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	552 "Signal the end from iterator.__next__()."
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 73981 diff changeset	553 );
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	554
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	555
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	556 /*
44129 b637349336fd Merged revisions 59275-59303 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44125 diff changeset	557 * GeneratorExit extends BaseException
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	558 */
44129 b637349336fd Merged revisions 59275-59303 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44125 diff changeset	559 SimpleExtendsException(PyExc_BaseException, GeneratorExit,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	560 "Request that a generator exit.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	561
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	562
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	563 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	564 * SystemExit extends BaseException
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	565 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	566
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	567 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	568 SystemExit_init(PySystemExitObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	569 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	570 Py_ssize_t size = PyTuple_GET_SIZE(args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	571
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	572 if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	573 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	574
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	575 if (size == 0)
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	576 return 0;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	577 Py_CLEAR(self->code);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	578 if (size == 1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	579 self->code = PyTuple_GET_ITEM(args, 0);
70403 772d9825f154 SystemExit_init(): avoid an useless test Victor Stinner <victor.stinner@haypocalc.com> parents: 68257 diff changeset	580 else /* size > 1 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	581 self->code = args;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	582 Py_INCREF(self->code);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	583 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	584 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	585
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	586 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	587 SystemExit_clear(PySystemExitObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	588 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	589 Py_CLEAR(self->code);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	590 return BaseException_clear((PyBaseExceptionObject *)self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	591 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	592
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	593 static void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	594 SystemExit_dealloc(PySystemExitObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	595 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	596 _PyObject_GC_UNTRACK(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	597 SystemExit_clear(self);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	598 Py_TYPE(self)->tp_free((PyObject *)self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	599 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	600
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	601 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	602 SystemExit_traverse(PySystemExitObject self, visitproc visit, void arg)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	603 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	604 Py_VISIT(self->code);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	605 return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	606 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	607
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	608 static PyMemberDef SystemExit_members[] = {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	609 {"code", T_OBJECT, offsetof(PySystemExitObject, code), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	610 PyDoc_STR("exception code")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	611 {NULL} /* Sentinel */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	612 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	613
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	614 ComplexExtendsException(PyExc_BaseException, SystemExit, SystemExit,
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	615 0, 0, SystemExit_members, 0, 0,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	616 "Request to exit from the interpreter.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	617
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	618 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	619 * KeyboardInterrupt extends BaseException
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	620 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	621 SimpleExtendsException(PyExc_BaseException, KeyboardInterrupt,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	622 "Program interrupted by user.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	623
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	624
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	625 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	626 * ImportError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	627 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	628 SimpleExtendsException(PyExc_Exception, ImportError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	629 "Import can't find module, or can't find name in module.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	630
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	631
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	632 /*
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	633 * OSError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	634 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	635
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	636 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	637 #include "errmap.h"
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	638 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	639
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	640 /* Where a function has a single filename, such as open() or some
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	641 * of the os module functions, PyErr_SetFromErrnoWithFilename() is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	642 * called, giving a third argument which is the filename. But, so
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	643 * that old code using in-place unpacking doesn't break, e.g.:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	644 *
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	645 * except OSError, (errno, strerror):
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	646 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	647 * we hack args so that it only contains two items. This also
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	648 * means we need our own __str__() which prints out the filename
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	649 * when it was supplied.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	650 */
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	651
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	652 /* This function doesn't cleanup on error, the caller should */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	653 static int
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	654 oserror_parse_args(PyObject **p_args,
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	655 PyObject myerrno, PyObject strerror,
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	656 PyObject **filename
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	657 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	658 , PyObject **winerror
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	659 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	660 )
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	661 {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	662 Py_ssize_t nargs;
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	663 PyObject args = p_args;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	664
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	665 nargs = PyTuple_GET_SIZE(args);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	666
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	667 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	668 if (nargs >= 2 && nargs <= 4) {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	669 if (!PyArg_UnpackTuple(args, "OSError", 2, 4,
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	670 myerrno, strerror, filename, winerror))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	671 return -1;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	672 if (winerror && PyLong_Check(winerror)) {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	673 long errcode, winerrcode;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	674 PyObject *newargs;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	675 Py_ssize_t i;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	676
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	677 winerrcode = PyLong_AsLong(*winerror);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	678 if (winerrcode == -1 && PyErr_Occurred())
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	679 return -1;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	680 /* Set errno to the corresponding POSIX errno (overriding
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	681 first argument). Windows Socket error codes (>= 10000)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	682 have the same value as their POSIX counterparts.
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	683 */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	684 if (winerrcode < 10000)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	685 errcode = winerror_to_errno(winerrcode);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	686 else
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	687 errcode = winerrcode;
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	688 *myerrno = PyLong_FromLong(errcode);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	689 if (!*myerrno)
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	690 return -1;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	691 newargs = PyTuple_New(nargs);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	692 if (!newargs)
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	693 return -1;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	694 PyTuple_SET_ITEM(newargs, 0, *myerrno);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	695 for (i = 1; i < nargs; i++) {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	696 PyObject *val = PyTuple_GET_ITEM(args, i);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	697 Py_INCREF(val);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	698 PyTuple_SET_ITEM(newargs, i, val);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	699 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	700 Py_DECREF(args);
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	701 args = *p_args = newargs;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	702 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	703 }
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	704 #else
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	705 if (nargs >= 2 && nargs <= 3) {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	706 if (!PyArg_UnpackTuple(args, "OSError", 2, 3,
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	707 myerrno, strerror, filename))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	708 return -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	709 }
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	710 #endif
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	711
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	712 return 0;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	713 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	714
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	715 static int
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	716 oserror_init(PyOSErrorObject self, PyObject *p_args,
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	717 PyObject myerrno, PyObject strerror,
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	718 PyObject *filename
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	719 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	720 , PyObject *winerror
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	721 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	722 )
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	723 {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	724 PyObject args = p_args;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	725 Py_ssize_t nargs = PyTuple_GET_SIZE(args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	726
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	727 /* self->filename will remain Py_None otherwise */
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	728 if (filename && filename != Py_None) {
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	729 if (Py_TYPE(self) == (PyTypeObject *) PyExc_BlockingIOError &&
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	730 PyNumber_Check(filename)) {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	731 /* BlockingIOError's 3rd argument can be the number of
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	732 * characters written.
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	733 */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	734 self->written = PyNumber_AsSsize_t(filename, PyExc_ValueError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	735 if (self->written == -1 && PyErr_Occurred())
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	736 return -1;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	737 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	738 else {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	739 Py_INCREF(filename);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	740 self->filename = filename;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	741
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	742 if (nargs >= 2 && nargs <= 3) {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	743 /* filename is removed from the args tuple (for compatibility
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	744 purposes, see test_exceptions.py) */
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	745 PyObject *subslice = PyTuple_GetSlice(args, 0, 2);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	746 if (!subslice)
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	747 return -1;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	748
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	749 Py_DECREF(args); /* replacing args */
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	750 *p_args = args = subslice;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	751 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	752 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	753 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	754 Py_XINCREF(myerrno);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	755 self->myerrno = myerrno;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	756
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	757 Py_XINCREF(strerror);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	758 self->strerror = strerror;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	759
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	760 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	761 Py_XINCREF(winerror);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	762 self->winerror = winerror;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	763 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	764
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	765 /* Steals the reference to args */
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	766 self->args = args;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	767 args = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	768
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	769 return 0;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	770 }
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	771
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	772 static PyObject *
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	773 OSError_new(PyTypeObject type, PyObject args, PyObject *kwds);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	774 static int
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	775 OSError_init(PyOSErrorObject self, PyObject args, PyObject *kwds);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	776
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	777 static int
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	778 oserror_use_init(PyTypeObject *type)
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	779 {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	780 /* When __init__ is defined in a OSError subclass, we want any
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	781 extraneous argument to __new__ to be ignored. The only reasonable
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	782 solution, given __new__ takes a variable number of arguments,
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	783 is to defer arg parsing and initialization to __init__.
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	784
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	785 But when __new__ is overriden as well, it should call our __new__
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	786 with the right arguments.
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	787
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	788 (see http://bugs.python.org/issue12555#msg148829 )
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	789 */
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	790 if (type->tp_init != (initproc) OSError_init &&
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	791 type->tp_new == (newfunc) OSError_new) {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	792 assert((PyObject *) type != PyExc_OSError);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	793 return 1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	794 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	795 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	796 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	797
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	798 static PyObject *
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	799 OSError_new(PyTypeObject type, PyObject args, PyObject *kwds)
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	800 {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	801 PyOSErrorObject *self = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	802 PyObject myerrno = NULL, strerror = NULL, *filename = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	803 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	804 PyObject *winerror = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	805 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	806
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	807 if (!oserror_use_init(type)) {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	808 if (!_PyArg_NoKeywords(type->tp_name, kwds))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	809 return NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	810
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	811 Py_INCREF(args);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	812 if (oserror_parse_args(&args, &myerrno, &strerror, &filename
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	813 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	814 , &winerror
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	815 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	816 ))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	817 goto error;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	818
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	819 if (myerrno && PyLong_Check(myerrno) &&
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	820 errnomap && (PyObject *) type == PyExc_OSError) {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	821 PyObject *newtype;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	822 newtype = PyDict_GetItem(errnomap, myerrno);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	823 if (newtype) {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	824 assert(PyType_Check(newtype));
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	825 type = (PyTypeObject *) newtype;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	826 }
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	827 else if (PyErr_Occurred())
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	828 goto error;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	829 }
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	830 }
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	831
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	832 self = (PyOSErrorObject *) type->tp_alloc(type, 0);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	833 if (!self)
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	834 goto error;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	835
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	836 self->dict = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	837 self->traceback = self->cause = self->context = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	838 self->written = -1;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	839
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	840 if (!oserror_use_init(type)) {
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	841 if (oserror_init(self, &args, myerrno, strerror, filename
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	842 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	843 , winerror
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	844 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	845 ))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	846 goto error;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	847 }
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	848
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	849 return (PyObject *) self;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	850
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	851 error:
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	852 Py_XDECREF(args);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	853 Py_XDECREF(self);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	854 return NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	855 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	856
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	857 static int
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	858 OSError_init(PyOSErrorObject self, PyObject args, PyObject *kwds)
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	859 {
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	860 PyObject myerrno = NULL, strerror = NULL, *filename = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	861 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	862 PyObject *winerror = NULL;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	863 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	864
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	865 if (!oserror_use_init(Py_TYPE(self)))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	866 /* Everything already done in OSError_new */
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	867 return 0;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	868
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	869 if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	870 return -1;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	871
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	872 Py_INCREF(args);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	873 if (oserror_parse_args(&args, &myerrno, &strerror, &filename
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	874 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	875 , &winerror
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	876 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	877 ))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	878 goto error;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	879
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	880 if (oserror_init(self, &args, myerrno, strerror, filename
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	881 #ifdef MS_WINDOWS
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	882 , winerror
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	883 #endif
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	884 ))
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	885 goto error;
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	886
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	887 return 0;
73981 d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	888
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	889 error:
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	890 Py_XDECREF(args);
d22c99e77768 Fix OSError.__init__ and OSError.__new__ so that each of them can be Antoine Pitrou <solipsis@pitrou.net> parents: 73655 diff changeset	891 return -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	892 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	893
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	894 static int
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	895 OSError_clear(PyOSErrorObject *self)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	896 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	897 Py_CLEAR(self->myerrno);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	898 Py_CLEAR(self->strerror);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	899 Py_CLEAR(self->filename);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	900 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	901 Py_CLEAR(self->winerror);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	902 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	903 return BaseException_clear((PyBaseExceptionObject *)self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	904 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	905
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	906 static void
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	907 OSError_dealloc(PyOSErrorObject *self)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	908 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	909 _PyObject_GC_UNTRACK(self);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	910 OSError_clear(self);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	911 Py_TYPE(self)->tp_free((PyObject *)self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	912 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	913
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	914 static int
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	915 OSError_traverse(PyOSErrorObject *self, visitproc visit,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	916 void *arg)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	917 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	918 Py_VISIT(self->myerrno);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	919 Py_VISIT(self->strerror);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	920 Py_VISIT(self->filename);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	921 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	922 Py_VISIT(self->winerror);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	923 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	924 return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	925 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	926
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	927 static PyObject *
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	928 OSError_str(PyOSErrorObject *self)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	929 {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	930 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	931 /* If available, winerror has the priority over myerrno */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	932 if (self->winerror && self->filename)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	933 return PyUnicode_FromFormat("[Error %S] %S: %R",
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	934 self->winerror ? self->winerror: Py_None,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	935 self->strerror ? self->strerror: Py_None,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	936 self->filename);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	937 if (self->winerror && self->strerror)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	938 return PyUnicode_FromFormat("[Error %S] %S",
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	939 self->winerror ? self->winerror: Py_None,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	940 self->strerror ? self->strerror: Py_None);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	941 #endif
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	942 if (self->filename)
1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	943 return PyUnicode_FromFormat("[Errno %S] %S: %R",
1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	944 self->myerrno ? self->myerrno: Py_None,
1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	945 self->strerror ? self->strerror: Py_None,
1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	946 self->filename);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	947 if (self->myerrno && self->strerror)
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	948 return PyUnicode_FromFormat("[Errno %S] %S",
1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	949 self->myerrno ? self->myerrno: Py_None,
1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	950 self->strerror ? self->strerror: Py_None);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	951 return BaseException_str((PyBaseExceptionObject *)self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	952 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	953
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	954 static PyObject *
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	955 OSError_reduce(PyOSErrorObject *self)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	956 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	957 PyObject *args = self->args;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	958 PyObject res = NULL, tmp;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	959
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	960 /* self->args is only the first two real arguments if there was a
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	961 * file name given to OSError. */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	962 if (PyTuple_GET_SIZE(args) == 2 && self->filename) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	963 args = PyTuple_New(3);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	964 if (!args) return NULL;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	965
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	966 tmp = PyTuple_GET_ITEM(self->args, 0);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	967 Py_INCREF(tmp);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	968 PyTuple_SET_ITEM(args, 0, tmp);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	969
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	970 tmp = PyTuple_GET_ITEM(self->args, 1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	971 Py_INCREF(tmp);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	972 PyTuple_SET_ITEM(args, 1, tmp);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	973
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	974 Py_INCREF(self->filename);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	975 PyTuple_SET_ITEM(args, 2, self->filename);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	976 } else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	977 Py_INCREF(args);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	978
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	979 if (self->dict)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	980 res = PyTuple_Pack(3, Py_TYPE(self), args, self->dict);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	981 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	982 res = PyTuple_Pack(2, Py_TYPE(self), args);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	983 Py_DECREF(args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	984 return res;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	985 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	986
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	987 static PyObject *
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	988 OSError_written_get(PyOSErrorObject self, void context)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	989 {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	990 if (self->written == -1) {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	991 PyErr_SetString(PyExc_AttributeError, "characters_written");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	992 return NULL;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	993 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	994 return PyLong_FromSsize_t(self->written);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	995 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	996
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	997 static int
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	998 OSError_written_set(PyOSErrorObject self, PyObject arg, void *context)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	999 {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1000 Py_ssize_t n;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1001 n = PyNumber_AsSsize_t(arg, PyExc_ValueError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1002 if (n == -1 && PyErr_Occurred())
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1003 return -1;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1004 self->written = n;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1005 return 0;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1006 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1007
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1008 static PyMemberDef OSError_members[] = {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1009 {"errno", T_OBJECT, offsetof(PyOSErrorObject, myerrno), 0,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1010 PyDoc_STR("POSIX exception code")},
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1011 {"strerror", T_OBJECT, offsetof(PyOSErrorObject, strerror), 0,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1012 PyDoc_STR("exception strerror")},
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1013 {"filename", T_OBJECT, offsetof(PyOSErrorObject, filename), 0,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1014 PyDoc_STR("exception filename")},
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1015 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1016 {"winerror", T_OBJECT, offsetof(PyOSErrorObject, winerror), 0,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1017 PyDoc_STR("Win32 exception code")},
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1018 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1019 {NULL} /* Sentinel */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1020 };
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1021
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1022 static PyMethodDef OSError_methods[] = {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1023 {"__reduce__", (PyCFunction)OSError_reduce, METH_NOARGS},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1024 {NULL}
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1025 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1026
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1027 static PyGetSetDef OSError_getset[] = {
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1028 {"characters_written", (getter) OSError_written_get,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1029 (setter) OSError_written_set, NULL},
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1030 {NULL}
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1031 };
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1032
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1033
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1034 ComplexExtendsException(PyExc_Exception, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1035 OSError, OSError_new,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1036 OSError_methods, OSError_members, OSError_getset,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1037 OSError_str,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1038 "Base class for I/O related errors.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1039
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1040
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1041 /*
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1042 * Various OSError subclasses
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1043 */
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1044 MiddlingExtendsException(PyExc_OSError, BlockingIOError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1045 "I/O operation would block.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1046 MiddlingExtendsException(PyExc_OSError, ConnectionError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1047 "Connection error.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1048 MiddlingExtendsException(PyExc_OSError, ChildProcessError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1049 "Child process error.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1050 MiddlingExtendsException(PyExc_ConnectionError, BrokenPipeError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1051 "Broken pipe.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1052 MiddlingExtendsException(PyExc_ConnectionError, ConnectionAbortedError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1053 "Connection aborted.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1054 MiddlingExtendsException(PyExc_ConnectionError, ConnectionRefusedError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1055 "Connection refused.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1056 MiddlingExtendsException(PyExc_ConnectionError, ConnectionResetError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1057 "Connection reset.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1058 MiddlingExtendsException(PyExc_OSError, FileExistsError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1059 "File already exists.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1060 MiddlingExtendsException(PyExc_OSError, FileNotFoundError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1061 "File not found.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1062 MiddlingExtendsException(PyExc_OSError, IsADirectoryError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1063 "Operation doesn't work on directories.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1064 MiddlingExtendsException(PyExc_OSError, NotADirectoryError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1065 "Operation only works on directories.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1066 MiddlingExtendsException(PyExc_OSError, InterruptedError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1067 "Interrupted by signal.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1068 MiddlingExtendsException(PyExc_OSError, PermissionError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1069 "Not enough permissions.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1070 MiddlingExtendsException(PyExc_OSError, ProcessLookupError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1071 "Process not found.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1072 MiddlingExtendsException(PyExc_OSError, TimeoutError, OSError,
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1073 "Timeout expired.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1074
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1075 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1076 * EOFError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1077 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1078 SimpleExtendsException(PyExc_Exception, EOFError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1079 "Read beyond end of file.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1080
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1081
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1082 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1083 * RuntimeError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1084 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1085 SimpleExtendsException(PyExc_Exception, RuntimeError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1086 "Unspecified run-time error.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1087
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1088
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1089 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1090 * NotImplementedError extends RuntimeError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1091 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1092 SimpleExtendsException(PyExc_RuntimeError, NotImplementedError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1093 "Method or function hasn't been implemented yet.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1094
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1095 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1096 * NameError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1097 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1098 SimpleExtendsException(PyExc_Exception, NameError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1099 "Name not found globally.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1100
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1101 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1102 * UnboundLocalError extends NameError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1103 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1104 SimpleExtendsException(PyExc_NameError, UnboundLocalError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1105 "Local name referenced but not bound to a value.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1106
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1107 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1108 * AttributeError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1109 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1110 SimpleExtendsException(PyExc_Exception, AttributeError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1111 "Attribute not found.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1112
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1113
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1114 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1115 * SyntaxError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1116 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1117
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1118 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1119 SyntaxError_init(PySyntaxErrorObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1120 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1121 PyObject *info = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1122 Py_ssize_t lenargs = PyTuple_GET_SIZE(args);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1123
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1124 if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1125 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1126
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1127 if (lenargs >= 1) {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1128 Py_CLEAR(self->msg);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1129 self->msg = PyTuple_GET_ITEM(args, 0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1130 Py_INCREF(self->msg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1131 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1132 if (lenargs == 2) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1133 info = PyTuple_GET_ITEM(args, 1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1134 info = PySequence_Tuple(info);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1135 if (!info) return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1136
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1137 if (PyTuple_GET_SIZE(info) != 4) {
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1138 /* not a very good error message, but it's what Python 2.4 gives */
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1139 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1140 Py_DECREF(info);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1141 return -1;
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1142 }
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1143
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1144 Py_CLEAR(self->filename);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1145 self->filename = PyTuple_GET_ITEM(info, 0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1146 Py_INCREF(self->filename);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1147
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1148 Py_CLEAR(self->lineno);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1149 self->lineno = PyTuple_GET_ITEM(info, 1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1150 Py_INCREF(self->lineno);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1151
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1152 Py_CLEAR(self->offset);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1153 self->offset = PyTuple_GET_ITEM(info, 2);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1154 Py_INCREF(self->offset);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1155
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1156 Py_CLEAR(self->text);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1157 self->text = PyTuple_GET_ITEM(info, 3);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1158 Py_INCREF(self->text);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1159
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1160 Py_DECREF(info);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1161 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1162 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1163 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1164
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1165 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1166 SyntaxError_clear(PySyntaxErrorObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1167 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1168 Py_CLEAR(self->msg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1169 Py_CLEAR(self->filename);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1170 Py_CLEAR(self->lineno);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1171 Py_CLEAR(self->offset);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1172 Py_CLEAR(self->text);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1173 Py_CLEAR(self->print_file_and_line);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1174 return BaseException_clear((PyBaseExceptionObject *)self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1175 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1176
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1177 static void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1178 SyntaxError_dealloc(PySyntaxErrorObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1179 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1180 _PyObject_GC_UNTRACK(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1181 SyntaxError_clear(self);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	1182 Py_TYPE(self)->tp_free((PyObject *)self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1183 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1184
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1185 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1186 SyntaxError_traverse(PySyntaxErrorObject self, visitproc visit, void arg)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1187 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1188 Py_VISIT(self->msg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1189 Py_VISIT(self->filename);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1190 Py_VISIT(self->lineno);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1191 Py_VISIT(self->offset);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1192 Py_VISIT(self->text);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1193 Py_VISIT(self->print_file_and_line);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1194 return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1195 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1196
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1197 /* This is called "my_basename" instead of just "basename" to avoid name
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1198 conflicts with glibc; basename is already prototyped if _GNU_SOURCE is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1199 defined, and Python does define that. */
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1200 static PyObject*
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1201 my_basename(PyObject *name)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1202 {
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1203 Py_ssize_t i, size, offset;
72703 eb2821cc3edf Fix my_basename(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1204 int kind;
eb2821cc3edf Fix my_basename(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1205 void *data;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1206
72703 eb2821cc3edf Fix my_basename(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1207 if (PyUnicode_READY(name))
eb2821cc3edf Fix my_basename(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1208 return NULL;
eb2821cc3edf Fix my_basename(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1209 kind = PyUnicode_KIND(name);
eb2821cc3edf Fix my_basename(): make the string ready Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1210 data = PyUnicode_DATA(name);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1211 size = PyUnicode_GET_LENGTH(name);
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1212 offset = 0;
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1213 for(i=0; i < size; i++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1214 if (PyUnicode_READ(kind, data, i) == SEP)
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1215 offset = i + 1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1216 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1217 if (offset != 0)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1218 return PyUnicode_Substring(name, offset, size);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1219 else {
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1220 Py_INCREF(name);
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1221 return name;
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1222 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1223 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1224
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1225
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1226 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1227 SyntaxError_str(PySyntaxErrorObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1228 {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1229 int have_lineno = 0;
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1230 PyObject *filename;
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1231 PyObject *result;
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44129 diff changeset	1232 /* Below, we always ignore overflow errors, just printing -1.
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44129 diff changeset	1233 Still, we cannot allow an OverflowError to be raised, so
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44129 diff changeset	1234 we need to call PyLong_AsLongAndOverflow. */
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44129 diff changeset	1235 int overflow;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1236
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1237 /* XXX -- do all the additional formatting with filename and
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1238 lineno here */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1239
42855 d5b52d56beba Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42669 diff changeset	1240 if (self->filename && PyUnicode_Check(self->filename)) {
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1241 filename = my_basename(self->filename);
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1242 if (filename == NULL)
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1243 return NULL;
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1244 } else {
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1245 filename = NULL;
42305 d0719406b2c6 Change Py_BuildValue to generate Unicode objects for Martin v. Löwis <martin@v.loewis.de> parents: 42118 diff changeset	1246 }
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44129 diff changeset	1247 have_lineno = (self->lineno != NULL) && PyLong_CheckExact(self->lineno);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1248
42305 d0719406b2c6 Change Py_BuildValue to generate Unicode objects for Martin v. Löwis <martin@v.loewis.de> parents: 42118 diff changeset	1249 if (!filename && !have_lineno)
43866 8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the Thomas Heller <theller@ctypes.org> parents: 43777 diff changeset	1250 return PyObject_Str(self->msg ? self->msg : Py_None);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1251
42305 d0719406b2c6 Change Py_BuildValue to generate Unicode objects for Martin v. Löwis <martin@v.loewis.de> parents: 42118 diff changeset	1252 if (filename && have_lineno)
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1253 result = PyUnicode_FromFormat("%S (%U, line %ld)",
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	1254 self->msg ? self->msg : Py_None,
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1255 filename,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59128 diff changeset	1256 PyLong_AsLongAndOverflow(self->lineno, &overflow));
42305 d0719406b2c6 Change Py_BuildValue to generate Unicode objects for Martin v. Löwis <martin@v.loewis.de> parents: 42118 diff changeset	1257 else if (filename)
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1258 result = PyUnicode_FromFormat("%S (%U)",
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	1259 self->msg ? self->msg : Py_None,
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1260 filename);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1261 else /* only have_lineno */
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1262 result = PyUnicode_FromFormat("%S (line %ld)",
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	1263 self->msg ? self->msg : Py_None,
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44129 diff changeset	1264 PyLong_AsLongAndOverflow(self->lineno, &overflow));
61058 04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1265 Py_XDECREF(filename);
04a18e59cc2c Don't decode/recode the unicode filename in SyntaxError_str() Victor Stinner <victor.stinner@haypocalc.com> parents: 59127 diff changeset	1266 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1267 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1268
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1269 static PyMemberDef SyntaxError_members[] = {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1270 {"msg", T_OBJECT, offsetof(PySyntaxErrorObject, msg), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1271 PyDoc_STR("exception msg")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1272 {"filename", T_OBJECT, offsetof(PySyntaxErrorObject, filename), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1273 PyDoc_STR("exception filename")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1274 {"lineno", T_OBJECT, offsetof(PySyntaxErrorObject, lineno), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1275 PyDoc_STR("exception lineno")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1276 {"offset", T_OBJECT, offsetof(PySyntaxErrorObject, offset), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1277 PyDoc_STR("exception offset")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1278 {"text", T_OBJECT, offsetof(PySyntaxErrorObject, text), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1279 PyDoc_STR("exception text")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1280 {"print_file_and_line", T_OBJECT,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1281 offsetof(PySyntaxErrorObject, print_file_and_line), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1282 PyDoc_STR("exception print_file_and_line")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1283 {NULL} /* Sentinel */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1284 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1285
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1286 ComplexExtendsException(PyExc_Exception, SyntaxError, SyntaxError,
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1287 0, 0, SyntaxError_members, 0,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1288 SyntaxError_str, "Invalid syntax.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1289
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1290
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1291 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1292 * IndentationError extends SyntaxError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1293 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1294 MiddlingExtendsException(PyExc_SyntaxError, IndentationError, SyntaxError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1295 "Improper indentation.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1296
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1297
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1298 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1299 * TabError extends IndentationError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1300 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1301 MiddlingExtendsException(PyExc_IndentationError, TabError, SyntaxError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1302 "Improper mixture of spaces and tabs.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1303
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1304
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1305 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1306 * LookupError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1307 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1308 SimpleExtendsException(PyExc_Exception, LookupError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1309 "Base class for lookup errors.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1310
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1311
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1312 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1313 * IndexError extends LookupError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1314 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1315 SimpleExtendsException(PyExc_LookupError, IndexError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1316 "Sequence index out of range.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1317
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1318
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1319 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1320 * KeyError extends LookupError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1321 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1322 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1323 KeyError_str(PyBaseExceptionObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1324 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1325 /* If args is a tuple of exactly one item, apply repr to args[0].
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1326 This is done so that e.g. the exception raised by {}[''] prints
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1327 KeyError: ''
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1328 rather than the confusing
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1329 KeyError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1330 alone. The downside is that if KeyError is raised with an explanatory
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1331 string, that string will be displayed in quotes. Too bad.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1332 If args is anything else, use the default BaseException__str__().
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1333 */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1334 if (PyTuple_GET_SIZE(self->args) == 1) {
41882 1056530616ac Change tp_str implementations of exception classes Walter Dörwald <walter@livinglogic.de> parents: 41782 diff changeset	1335 return PyObject_Repr(PyTuple_GET_ITEM(self->args, 0));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1336 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1337 return BaseException_str(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1338 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1339
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1340 ComplexExtendsException(PyExc_LookupError, KeyError, BaseException,
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	1341 0, 0, 0, 0, KeyError_str, "Mapping key not found.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1342
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1343
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1344 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1345 * ValueError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1346 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1347 SimpleExtendsException(PyExc_Exception, ValueError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1348 "Inappropriate argument value (of correct type).");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1349
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1350 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1351 * UnicodeError extends ValueError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1352 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1353
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1354 SimpleExtendsException(PyExc_ValueError, UnicodeError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1355 "Unicode related error.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1356
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1357 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1358 get_string(PyObject attr, const char name)
41611 c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1359 {
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1360 if (!attr) {
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1361 PyErr_Format(PyExc_TypeError, "%.200s attribute not set", name);
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1362 return NULL;
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1363 }
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1364
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46682 diff changeset	1365 if (!PyBytes_Check(attr)) {
41611 c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1366 PyErr_Format(PyExc_TypeError, "%.200s attribute must be bytes", name);
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1367 return NULL;
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1368 }
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1369 Py_INCREF(attr);
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1370 return attr;
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1371 }
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1372
c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	1373 static PyObject *
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1374 get_unicode(PyObject attr, const char name)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1375 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1376 if (!attr) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1377 PyErr_Format(PyExc_TypeError, "%.200s attribute not set", name);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1378 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1379 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1380
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1381 if (!PyUnicode_Check(attr)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1382 PyErr_Format(PyExc_TypeError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1383 "%.200s attribute must be unicode", name);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1384 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1385 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1386 Py_INCREF(attr);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1387 return attr;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1388 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1389
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1390 static int
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1391 set_unicodefromstring(PyObject *attr, const char value)
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1392 {
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1393 PyObject *obj = PyUnicode_FromString(value);
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1394 if (!obj)
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1395 return -1;
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1396 Py_CLEAR(*attr);
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1397 *attr = obj;
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1398 return 0;
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1399 }
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1400
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1401 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1402 PyUnicodeEncodeError_GetEncoding(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1403 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1404 return get_unicode(((PyUnicodeErrorObject *)exc)->encoding, "encoding");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1405 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1406
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1407 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1408 PyUnicodeDecodeError_GetEncoding(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1409 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1410 return get_unicode(((PyUnicodeErrorObject *)exc)->encoding, "encoding");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1411 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1412
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1413 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1414 PyUnicodeEncodeError_GetObject(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1415 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1416 return get_unicode(((PyUnicodeErrorObject *)exc)->object, "object");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1417 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1418
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1419 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1420 PyUnicodeDecodeError_GetObject(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1421 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1422 return get_string(((PyUnicodeErrorObject *)exc)->object, "object");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1423 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1424
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1425 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1426 PyUnicodeTranslateError_GetObject(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1427 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1428 return get_unicode(((PyUnicodeErrorObject *)exc)->object, "object");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1429 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1430
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1431 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1432 PyUnicodeEncodeError_GetStart(PyObject exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1433 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1434 Py_ssize_t size;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1435 PyObject obj = get_unicode(((PyUnicodeErrorObject )exc)->object,
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1436 "object");
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1437 if (!obj)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1438 return -1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1439 start = ((PyUnicodeErrorObject )exc)->start;
73655 2e37fc70e2dd Fix misuse of PyUnicode_GET_SIZE() => PyUnicode_GET_LENGTH() Victor Stinner <victor.stinner@haypocalc.com> parents: 73649 diff changeset	1440 size = PyUnicode_GET_LENGTH(obj);
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1441 if (*start<0)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1442 start = 0; /XXX check for values <0*/
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1443 if (*start>=size)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1444 *start = size-1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1445 Py_DECREF(obj);
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1446 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1447 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1448
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1449
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1450 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1451 PyUnicodeDecodeError_GetStart(PyObject exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1452 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1453 Py_ssize_t size;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1454 PyObject obj = get_string(((PyUnicodeErrorObject )exc)->object, "object");
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1455 if (!obj)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1456 return -1;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46682 diff changeset	1457 size = PyBytes_GET_SIZE(obj);
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1458 start = ((PyUnicodeErrorObject )exc)->start;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1459 if (*start<0)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1460 *start = 0;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1461 if (*start>=size)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1462 *start = size-1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1463 Py_DECREF(obj);
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1464 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1465 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1466
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1467
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1468 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1469 PyUnicodeTranslateError_GetStart(PyObject exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1470 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1471 return PyUnicodeEncodeError_GetStart(exc, start);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1472 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1473
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1474
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1475 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1476 PyUnicodeEncodeError_SetStart(PyObject *exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1477 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1478 ((PyUnicodeErrorObject *)exc)->start = start;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1479 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1480 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1481
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1482
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1483 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1484 PyUnicodeDecodeError_SetStart(PyObject *exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1485 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1486 ((PyUnicodeErrorObject *)exc)->start = start;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1487 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1488 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1489
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1490
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1491 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1492 PyUnicodeTranslateError_SetStart(PyObject *exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1493 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1494 ((PyUnicodeErrorObject *)exc)->start = start;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1495 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1496 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1497
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1498
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1499 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1500 PyUnicodeEncodeError_GetEnd(PyObject exc, Py_ssize_t end)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1501 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1502 Py_ssize_t size;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1503 PyObject obj = get_unicode(((PyUnicodeErrorObject )exc)->object,
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1504 "object");
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1505 if (!obj)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1506 return -1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1507 end = ((PyUnicodeErrorObject )exc)->end;
73655 2e37fc70e2dd Fix misuse of PyUnicode_GET_SIZE() => PyUnicode_GET_LENGTH() Victor Stinner <victor.stinner@haypocalc.com> parents: 73649 diff changeset	1508 size = PyUnicode_GET_LENGTH(obj);
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1509 if (*end<1)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1510 *end = 1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1511 if (*end>size)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1512 *end = size;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1513 Py_DECREF(obj);
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1514 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1515 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1516
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1517
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1518 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1519 PyUnicodeDecodeError_GetEnd(PyObject exc, Py_ssize_t end)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1520 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1521 Py_ssize_t size;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1522 PyObject obj = get_string(((PyUnicodeErrorObject )exc)->object, "object");
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1523 if (!obj)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1524 return -1;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46682 diff changeset	1525 size = PyBytes_GET_SIZE(obj);
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1526 end = ((PyUnicodeErrorObject )exc)->end;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1527 if (*end<1)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1528 *end = 1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1529 if (*end>size)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1530 *end = size;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1531 Py_DECREF(obj);
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1532 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1533 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1534
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1535
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1536 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1537 PyUnicodeTranslateError_GetEnd(PyObject exc, Py_ssize_t start)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1538 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1539 return PyUnicodeEncodeError_GetEnd(exc, start);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1540 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1541
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1542
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1543 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1544 PyUnicodeEncodeError_SetEnd(PyObject *exc, Py_ssize_t end)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1545 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1546 ((PyUnicodeErrorObject *)exc)->end = end;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1547 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1548 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1549
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1550
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1551 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1552 PyUnicodeDecodeError_SetEnd(PyObject *exc, Py_ssize_t end)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1553 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1554 ((PyUnicodeErrorObject *)exc)->end = end;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1555 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1556 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1557
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1558
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1559 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1560 PyUnicodeTranslateError_SetEnd(PyObject *exc, Py_ssize_t end)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1561 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1562 ((PyUnicodeErrorObject *)exc)->end = end;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1563 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1564 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1565
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1566 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1567 PyUnicodeEncodeError_GetReason(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1568 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1569 return get_unicode(((PyUnicodeErrorObject *)exc)->reason, "reason");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1570 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1571
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1572
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1573 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1574 PyUnicodeDecodeError_GetReason(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1575 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1576 return get_unicode(((PyUnicodeErrorObject *)exc)->reason, "reason");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1577 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1578
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1579
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1580 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1581 PyUnicodeTranslateError_GetReason(PyObject *exc)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1582 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1583 return get_unicode(((PyUnicodeErrorObject *)exc)->reason, "reason");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1584 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1585
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1586
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1587 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1588 PyUnicodeEncodeError_SetReason(PyObject exc, const char reason)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1589 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1590 return set_unicodefromstring(&((PyUnicodeErrorObject *)exc)->reason,
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1591 reason);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1592 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1593
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1594
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1595 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1596 PyUnicodeDecodeError_SetReason(PyObject exc, const char reason)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1597 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1598 return set_unicodefromstring(&((PyUnicodeErrorObject *)exc)->reason,
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1599 reason);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1600 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1601
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1602
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1603 int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1604 PyUnicodeTranslateError_SetReason(PyObject exc, const char reason)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1605 {
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1606 return set_unicodefromstring(&((PyUnicodeErrorObject *)exc)->reason,
d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1607 reason);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1608 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1609
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1610
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1611 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1612 UnicodeError_clear(PyUnicodeErrorObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1613 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1614 Py_CLEAR(self->encoding);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1615 Py_CLEAR(self->object);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1616 Py_CLEAR(self->reason);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1617 return BaseException_clear((PyBaseExceptionObject *)self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1618 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1619
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1620 static void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1621 UnicodeError_dealloc(PyUnicodeErrorObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1622 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1623 _PyObject_GC_UNTRACK(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1624 UnicodeError_clear(self);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	1625 Py_TYPE(self)->tp_free((PyObject *)self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1626 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1627
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1628 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1629 UnicodeError_traverse(PyUnicodeErrorObject self, visitproc visit, void arg)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1630 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1631 Py_VISIT(self->encoding);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1632 Py_VISIT(self->object);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1633 Py_VISIT(self->reason);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1634 return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1635 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1636
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1637 static PyMemberDef UnicodeError_members[] = {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1638 {"encoding", T_OBJECT, offsetof(PyUnicodeErrorObject, encoding), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1639 PyDoc_STR("exception encoding")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1640 {"object", T_OBJECT, offsetof(PyUnicodeErrorObject, object), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1641 PyDoc_STR("exception object")},
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1642 {"start", T_PYSSIZET, offsetof(PyUnicodeErrorObject, start), 0,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1643 PyDoc_STR("exception start")},
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1644 {"end", T_PYSSIZET, offsetof(PyUnicodeErrorObject, end), 0,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1645 PyDoc_STR("exception end")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1646 {"reason", T_OBJECT, offsetof(PyUnicodeErrorObject, reason), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1647 PyDoc_STR("exception reason")},
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1648 {NULL} /* Sentinel */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1649 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1650
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1651
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1652 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1653 * UnicodeEncodeError extends UnicodeError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1654 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1655
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1656 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1657 UnicodeEncodeError_init(PyObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1658 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1659 PyUnicodeErrorObject *err;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1660
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1661 if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1662 return -1;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1663
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1664 err = (PyUnicodeErrorObject *)self;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1665
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1666 Py_CLEAR(err->encoding);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1667 Py_CLEAR(err->object);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1668 Py_CLEAR(err->reason);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1669
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1670 if (!PyArg_ParseTuple(args, "O!O!nnO!",
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1671 &PyUnicode_Type, &err->encoding,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1672 &PyUnicode_Type, &err->object,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1673 &err->start,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1674 &err->end,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1675 &PyUnicode_Type, &err->reason)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1676 err->encoding = err->object = err->reason = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1677 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1678 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1679
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72879 diff changeset	1680 if (PyUnicode_READY(err->object) < -1) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72879 diff changeset	1681 err->encoding = NULL;
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72879 diff changeset	1682 return -1;
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72879 diff changeset	1683 }
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72879 diff changeset	1684
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1685 Py_INCREF(err->encoding);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1686 Py_INCREF(err->object);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1687 Py_INCREF(err->reason);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1688
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1689 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1690 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1691
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1692 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1693 UnicodeEncodeError_str(PyObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1694 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1695 PyUnicodeErrorObject uself = (PyUnicodeErrorObject )self;
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1696 PyObject *result = NULL;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1697 PyObject *reason_str = NULL;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1698 PyObject *encoding_str = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1699
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1700 /* Get reason and encoding as strings, which they might not be if
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1701 they've been modified after we were contructed. */
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1702 reason_str = PyObject_Str(uself->reason);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1703 if (reason_str == NULL)
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1704 goto done;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1705 encoding_str = PyObject_Str(uself->encoding);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1706 if (encoding_str == NULL)
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1707 goto done;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1708
73644 5b426bf9260c UnicodeEncodeError uses the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73350 diff changeset	1709 if (uself->start < PyUnicode_GET_LENGTH(uself->object) && uself->end == uself->start+1) {
5b426bf9260c UnicodeEncodeError uses the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73350 diff changeset	1710 Py_UCS4 badchar = PyUnicode_ReadChar(uself->object, uself->start);
41940 5014f8daa57f PyUnicode_FromFormat() does support %02x, so use it Walter Dörwald <walter@livinglogic.de> parents: 41882 diff changeset	1711 const char *fmt;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1712 if (badchar <= 0xff)
42118 70a0831feda6 Patch by Ron Adam: Don't use u prefix in unicode error messages Walter Dörwald <walter@livinglogic.de> parents: 42110 diff changeset	1713 fmt = "'%U' codec can't encode character '\\x%02x' in position %zd: %U";
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1714 else if (badchar <= 0xffff)
42118 70a0831feda6 Patch by Ron Adam: Don't use u prefix in unicode error messages Walter Dörwald <walter@livinglogic.de> parents: 42110 diff changeset	1715 fmt = "'%U' codec can't encode character '\\u%04x' in position %zd: %U";
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1716 else
42118 70a0831feda6 Patch by Ron Adam: Don't use u prefix in unicode error messages Walter Dörwald <walter@livinglogic.de> parents: 42110 diff changeset	1717 fmt = "'%U' codec can't encode character '\\U%08x' in position %zd: %U";
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1718 result = PyUnicode_FromFormat(
41940 5014f8daa57f PyUnicode_FromFormat() does support %02x, so use it Walter Dörwald <walter@livinglogic.de> parents: 41882 diff changeset	1719 fmt,
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1720 encoding_str,
73644 5b426bf9260c UnicodeEncodeError uses the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73350 diff changeset	1721 (int)badchar,
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1722 uself->start,
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1723 reason_str);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1724 }
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1725 else {
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1726 result = PyUnicode_FromFormat(
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1727 "'%U' codec can't encode characters in position %zd-%zd: %U",
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1728 encoding_str,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1729 uself->start,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1730 uself->end-1,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1731 reason_str);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1732 }
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1733 done:
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1734 Py_XDECREF(reason_str);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1735 Py_XDECREF(encoding_str);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1736 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1737 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1738
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1739 static PyTypeObject _PyExc_UnicodeEncodeError = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1740 PyVarObject_HEAD_INIT(NULL, 0)
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	1741 "UnicodeEncodeError",
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1742 sizeof(PyUnicodeErrorObject), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1743 (destructor)UnicodeError_dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1744 (reprfunc)UnicodeEncodeError_str, 0, 0, 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1745 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1746 PyDoc_STR("Unicode encoding error."), (traverseproc)UnicodeError_traverse,
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1747 (inquiry)UnicodeError_clear, 0, 0, 0, 0, 0, UnicodeError_members,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1748 0, &_PyExc_UnicodeError, 0, 0, 0, offsetof(PyUnicodeErrorObject, dict),
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1749 (initproc)UnicodeEncodeError_init, 0, BaseException_new,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1750 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1751 PyObject PyExc_UnicodeEncodeError = (PyObject )&_PyExc_UnicodeEncodeError;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1752
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1753 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1754 PyUnicodeEncodeError_Create(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1755 const char encoding, const Py_UNICODE object, Py_ssize_t length,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1756 Py_ssize_t start, Py_ssize_t end, const char *reason)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1757 {
62155 600c23127207 Issue #8848: U / U# formats of Py_BuildValue() are just alias to s / s# Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1758 return PyObject_CallFunction(PyExc_UnicodeEncodeError, "su#nns",
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1759 encoding, object, length, start, end, reason);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1760 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1761
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1762
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1763 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1764 * UnicodeDecodeError extends UnicodeError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1765 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1766
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1767 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1768 UnicodeDecodeError_init(PyObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1769 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1770 PyUnicodeErrorObject *ude;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1771 const char *data;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1772 Py_ssize_t size;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1773
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1774 if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1775 return -1;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1776
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1777 ude = (PyUnicodeErrorObject *)self;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1778
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1779 Py_CLEAR(ude->encoding);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1780 Py_CLEAR(ude->object);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1781 Py_CLEAR(ude->reason);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1782
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1783 if (!PyArg_ParseTuple(args, "O!OnnO!",
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1784 &PyUnicode_Type, &ude->encoding,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1785 &ude->object,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1786 &ude->start,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1787 &ude->end,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1788 &PyUnicode_Type, &ude->reason)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1789 ude->encoding = ude->object = ude->reason = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1790 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1791 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1792
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46682 diff changeset	1793 if (!PyBytes_Check(ude->object)) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1794 if (PyObject_AsReadBuffer(ude->object, (const void **)&data, &size)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1795 ude->encoding = ude->object = ude->reason = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1796 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1797 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46682 diff changeset	1798 ude->object = PyBytes_FromStringAndSize(data, size);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1799 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1800 else {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1801 Py_INCREF(ude->object);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1802 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1803
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1804 Py_INCREF(ude->encoding);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1805 Py_INCREF(ude->reason);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1806
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	1807 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1808 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1809
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1810 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1811 UnicodeDecodeError_str(PyObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1812 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1813 PyUnicodeErrorObject uself = (PyUnicodeErrorObject )self;
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1814 PyObject *result = NULL;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1815 PyObject *reason_str = NULL;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1816 PyObject *encoding_str = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1817
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1818 /* Get reason and encoding as strings, which they might not be if
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1819 they've been modified after we were contructed. */
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1820 reason_str = PyObject_Str(uself->reason);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1821 if (reason_str == NULL)
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1822 goto done;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1823 encoding_str = PyObject_Str(uself->encoding);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1824 if (encoding_str == NULL)
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1825 goto done;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1826
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1827 if (uself->start < PyBytes_GET_SIZE(uself->object) && uself->end == uself->start+1) {
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46682 diff changeset	1828 int byte = (int)(PyBytes_AS_STRING(((PyUnicodeErrorObject *)self)->object)[uself->start]&0xff);
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1829 result = PyUnicode_FromFormat(
41940 5014f8daa57f PyUnicode_FromFormat() does support %02x, so use it Walter Dörwald <walter@livinglogic.de> parents: 41882 diff changeset	1830 "'%U' codec can't decode byte 0x%02x in position %zd: %U",
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1831 encoding_str,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1832 byte,
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1833 uself->start,
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1834 reason_str);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1835 }
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1836 else {
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1837 result = PyUnicode_FromFormat(
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1838 "'%U' codec can't decode bytes in position %zd-%zd: %U",
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1839 encoding_str,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1840 uself->start,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1841 uself->end-1,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1842 reason_str
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1843 );
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1844 }
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1845 done:
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1846 Py_XDECREF(reason_str);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1847 Py_XDECREF(encoding_str);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1848 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1849 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1850
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1851 static PyTypeObject _PyExc_UnicodeDecodeError = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1852 PyVarObject_HEAD_INIT(NULL, 0)
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	1853 "UnicodeDecodeError",
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1854 sizeof(PyUnicodeErrorObject), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1855 (destructor)UnicodeError_dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1856 (reprfunc)UnicodeDecodeError_str, 0, 0, 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1857 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1858 PyDoc_STR("Unicode decoding error."), (traverseproc)UnicodeError_traverse,
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1859 (inquiry)UnicodeError_clear, 0, 0, 0, 0, 0, UnicodeError_members,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1860 0, &_PyExc_UnicodeError, 0, 0, 0, offsetof(PyUnicodeErrorObject, dict),
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1861 (initproc)UnicodeDecodeError_init, 0, BaseException_new,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1862 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1863 PyObject PyExc_UnicodeDecodeError = (PyObject )&_PyExc_UnicodeDecodeError;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1864
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1865 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1866 PyUnicodeDecodeError_Create(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1867 const char encoding, const char object, Py_ssize_t length,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1868 Py_ssize_t start, Py_ssize_t end, const char *reason)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1869 {
62155 600c23127207 Issue #8848: U / U# formats of Py_BuildValue() are just alias to s / s# Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1870 return PyObject_CallFunction(PyExc_UnicodeDecodeError, "sy#nns",
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1871 encoding, object, length, start, end, reason);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1872 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1873
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1874
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1875 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1876 * UnicodeTranslateError extends UnicodeError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1877 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1878
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1879 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1880 UnicodeTranslateError_init(PyUnicodeErrorObject self, PyObject args,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1881 PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1882 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1883 if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1884 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1885
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1886 Py_CLEAR(self->object);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1887 Py_CLEAR(self->reason);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1888
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1889 if (!PyArg_ParseTuple(args, "O!nnO!",
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1890 &PyUnicode_Type, &self->object,
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1891 &self->start,
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1892 &self->end,
41766 d6aa7edf217a Add 'U'/'U#' format characters to Py_BuildValue (and thus Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	1893 &PyUnicode_Type, &self->reason)) {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1894 self->object = self->reason = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1895 return -1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1896 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1897
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1898 Py_INCREF(self->object);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1899 Py_INCREF(self->reason);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1900
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1901 return 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1902 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1903
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1904
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1905 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1906 UnicodeTranslateError_str(PyObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1907 {
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1908 PyUnicodeErrorObject uself = (PyUnicodeErrorObject )self;
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1909 PyObject *result = NULL;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1910 PyObject *reason_str = NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1911
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1912 /* Get reason as a string, which it might not be if it's been
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1913 modified after we were contructed. */
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1914 reason_str = PyObject_Str(uself->reason);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1915 if (reason_str == NULL)
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1916 goto done;
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1917
73649 244d9159aa38 UnicodeTranslateError uses the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73644 diff changeset	1918 if (uself->start < PyUnicode_GET_LENGTH(uself->object) && uself->end == uself->start+1) {
244d9159aa38 UnicodeTranslateError uses the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73644 diff changeset	1919 Py_UCS4 badchar = PyUnicode_ReadChar(uself->object, uself->start);
41940 5014f8daa57f PyUnicode_FromFormat() does support %02x, so use it Walter Dörwald <walter@livinglogic.de> parents: 41882 diff changeset	1920 const char *fmt;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1921 if (badchar <= 0xff)
42118 70a0831feda6 Patch by Ron Adam: Don't use u prefix in unicode error messages Walter Dörwald <walter@livinglogic.de> parents: 42110 diff changeset	1922 fmt = "can't translate character '\\x%02x' in position %zd: %U";
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1923 else if (badchar <= 0xffff)
42118 70a0831feda6 Patch by Ron Adam: Don't use u prefix in unicode error messages Walter Dörwald <walter@livinglogic.de> parents: 42110 diff changeset	1924 fmt = "can't translate character '\\u%04x' in position %zd: %U";
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1925 else
42118 70a0831feda6 Patch by Ron Adam: Don't use u prefix in unicode error messages Walter Dörwald <walter@livinglogic.de> parents: 42110 diff changeset	1926 fmt = "can't translate character '\\U%08x' in position %zd: %U";
59128 f5ea1264b7ae Merged revisions 78437 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 59111 diff changeset	1927 result = PyUnicode_FromFormat(
41940 5014f8daa57f PyUnicode_FromFormat() does support %02x, so use it Walter Dörwald <walter@livinglogic.de> parents: 41882 diff changeset	1928 fmt,
73649 244d9159aa38 UnicodeTranslateError uses the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73644 diff changeset	1929 (int)badchar,
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1930 uself->start,
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1931 reason_str
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1932 );
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1933 } else {
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1934 result = PyUnicode_FromFormat(
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1935 "can't translate characters in position %zd-%zd: %U",
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1936 uself->start,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1937 uself->end-1,
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1938 reason_str
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1939 );
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1940 }
59111 c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1941 done:
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1942 Py_XDECREF(reason_str);
c8ef906b11b8 Merged revisions 78420 via svnmerge from Eric Smith <eric@trueblade.com> parents: 54770 diff changeset	1943 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1944 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1945
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1946 static PyTypeObject _PyExc_UnicodeTranslateError = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42305 diff changeset	1947 PyVarObject_HEAD_INIT(NULL, 0)
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	1948 "UnicodeTranslateError",
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1949 sizeof(PyUnicodeErrorObject), 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1950 (destructor)UnicodeError_dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1951 (reprfunc)UnicodeTranslateError_str, 0, 0, 0,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1952 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	1953 PyDoc_STR("Unicode translation error."), (traverseproc)UnicodeError_traverse,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1954 (inquiry)UnicodeError_clear, 0, 0, 0, 0, 0, UnicodeError_members,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1955 0, &_PyExc_UnicodeError, 0, 0, 0, offsetof(PyUnicodeErrorObject, dict),
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1956 (initproc)UnicodeTranslateError_init, 0, BaseException_new,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1957 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1958 PyObject PyExc_UnicodeTranslateError = (PyObject )&_PyExc_UnicodeTranslateError;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1959
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1960 /* Deprecated. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1961 PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1962 PyUnicodeTranslateError_Create(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1963 const Py_UNICODE *object, Py_ssize_t length,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1964 Py_ssize_t start, Py_ssize_t end, const char *reason)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1965 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1966 return PyObject_CallFunction(PyExc_UnicodeTranslateError, "u#nns",
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1967 object, length, start, end, reason);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1968 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1969
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1970 PyObject *
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1971 _PyUnicodeTranslateError_Create(
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1972 PyObject *object,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1973 Py_ssize_t start, Py_ssize_t end, const char *reason)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1974 {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1975 return PyObject_CallFunction(PyExc_UnicodeTranslateError, "Ons",
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1976 object, start, end, reason);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70403 diff changeset	1977 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1978
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1979 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1980 * AssertionError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1981 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1982 SimpleExtendsException(PyExc_Exception, AssertionError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1983 "Assertion failed.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1984
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1985
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1986 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1987 * ArithmeticError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1988 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	1989 SimpleExtendsException(PyExc_Exception, ArithmeticError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1990 "Base class for arithmetic errors.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1991
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1992
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1993 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1994 * FloatingPointError extends ArithmeticError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1995 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1996 SimpleExtendsException(PyExc_ArithmeticError, FloatingPointError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1997 "Floating point operation failed.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1998
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1999
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2000 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2001 * OverflowError extends ArithmeticError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2002 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2003 SimpleExtendsException(PyExc_ArithmeticError, OverflowError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2004 "Result too large to be represented.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2005
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2006
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2007 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2008 * ZeroDivisionError extends ArithmeticError
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2009 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2010 SimpleExtendsException(PyExc_ArithmeticError, ZeroDivisionError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2011 "Second argument to a division or modulo operation was zero.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2012
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2013
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2014 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	2015 * SystemError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2016 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	2017 SimpleExtendsException(PyExc_Exception, SystemError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2018 "Internal error in the Python interpreter.\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2019 "\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2020 "Please report this to the Python maintainer, along with the traceback,\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2021 "the Python version, and the hardware/OS platform and version.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2022
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2023
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2024 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	2025 * ReferenceError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2026 */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	2027 SimpleExtendsException(PyExc_Exception, ReferenceError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2028 "Weak ref proxy used after referent went away.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2029
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2030
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2031 /*
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41940 diff changeset	2032 * MemoryError extends Exception
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2033 */
65690 c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2034
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2035 #define MEMERRORS_SAVE 16
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2036 static PyBaseExceptionObject *memerrors_freelist = NULL;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2037 static int memerrors_numfree = 0;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2038
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2039 static PyObject *
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2040 MemoryError_new(PyTypeObject type, PyObject args, PyObject *kwds)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2041 {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2042 PyBaseExceptionObject *self;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2043
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2044 if (type != (PyTypeObject *) PyExc_MemoryError)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2045 return BaseException_new(type, args, kwds);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2046 if (memerrors_freelist == NULL)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2047 return BaseException_new(type, args, kwds);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2048 /* Fetch object from freelist and revive it */
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2049 self = memerrors_freelist;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2050 self->args = PyTuple_New(0);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2051 /* This shouldn't happen since the empty tuple is persistent */
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2052 if (self->args == NULL)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2053 return NULL;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2054 memerrors_freelist = (PyBaseExceptionObject *) self->dict;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2055 memerrors_numfree--;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2056 self->dict = NULL;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2057 _Py_NewReference((PyObject *)self);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2058 _PyObject_GC_TRACK(self);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2059 return (PyObject *)self;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2060 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2061
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2062 static void
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2063 MemoryError_dealloc(PyBaseExceptionObject *self)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2064 {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2065 _PyObject_GC_UNTRACK(self);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2066 BaseException_clear(self);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2067 if (memerrors_numfree >= MEMERRORS_SAVE)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2068 Py_TYPE(self)->tp_free((PyObject *)self);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2069 else {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2070 self->dict = (PyObject *) memerrors_freelist;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2071 memerrors_freelist = self;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2072 memerrors_numfree++;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2073 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2074 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2075
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2076 static void
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2077 preallocate_memerrors(void)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2078 {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2079 /* We create enough MemoryErrors and then decref them, which will fill
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2080 up the freelist. */
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2081 int i;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2082 PyObject *errors[MEMERRORS_SAVE];
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2083 for (i = 0; i < MEMERRORS_SAVE; i++) {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2084 errors[i] = MemoryError_new((PyTypeObject *) PyExc_MemoryError,
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2085 NULL, NULL);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2086 if (!errors[i])
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2087 Py_FatalError("Could not preallocate MemoryError object");
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2088 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2089 for (i = 0; i < MEMERRORS_SAVE; i++) {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2090 Py_DECREF(errors[i]);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2091 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2092 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2093
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2094 static void
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2095 free_preallocated_memerrors(void)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2096 {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2097 while (memerrors_freelist != NULL) {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2098 PyObject self = (PyObject ) memerrors_freelist;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2099 memerrors_freelist = (PyBaseExceptionObject *) memerrors_freelist->dict;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2100 Py_TYPE(self)->tp_free((PyObject *)self);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2101 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2102 }
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2103
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2104
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2105 static PyTypeObject _PyExc_MemoryError = {
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2106 PyVarObject_HEAD_INIT(NULL, 0)
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2107 "MemoryError",
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2108 sizeof(PyBaseExceptionObject),
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2109 0, (destructor)MemoryError_dealloc, 0, 0, 0, 0, 0, 0, 0,
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2110 0, 0, 0, 0, 0, 0, 0,
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2111 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2112 PyDoc_STR("Out of memory."), (traverseproc)BaseException_traverse,
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2113 (inquiry)BaseException_clear, 0, 0, 0, 0, 0, 0, 0, &_PyExc_Exception,
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2114 0, 0, 0, offsetof(PyBaseExceptionObject, dict),
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2115 (initproc)BaseException_init, 0, MemoryError_new
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2116 };
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2117 PyObject PyExc_MemoryError = (PyObject ) &_PyExc_MemoryError;
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2118
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2119
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42334 diff changeset	2120 /*
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42334 diff changeset	2121 * BufferError extends Exception
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42334 diff changeset	2122 */
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42334 diff changeset	2123 SimpleExtendsException(PyExc_Exception, BufferError, "Buffer error.");
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42334 diff changeset	2124
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2125
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2126 /* Warning category docstrings */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2127
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2128 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2129 * Warning extends Exception
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2130 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2131 SimpleExtendsException(PyExc_Exception, Warning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2132 "Base class for warning categories.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2133
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2134
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2135 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2136 * UserWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2137 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2138 SimpleExtendsException(PyExc_Warning, UserWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2139 "Base class for warnings generated by user code.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2140
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2141
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2142 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2143 * DeprecationWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2144 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2145 SimpleExtendsException(PyExc_Warning, DeprecationWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2146 "Base class for warnings about deprecated features.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2147
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2148
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2149 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2150 * PendingDeprecationWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2151 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2152 SimpleExtendsException(PyExc_Warning, PendingDeprecationWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2153 "Base class for warnings about features which will be deprecated\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2154 "in the future.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2155
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2156
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2157 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2158 * SyntaxWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2159 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2160 SimpleExtendsException(PyExc_Warning, SyntaxWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2161 "Base class for warnings about dubious syntax.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2162
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2163
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2164 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2165 * RuntimeWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2166 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2167 SimpleExtendsException(PyExc_Warning, RuntimeWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2168 "Base class for warnings about dubious runtime behavior.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2169
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2170
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2171 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2172 * FutureWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2173 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2174 SimpleExtendsException(PyExc_Warning, FutureWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2175 "Base class for warnings about constructs that will change semantically\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2176 "in the future.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2177
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2178
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2179 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2180 * ImportWarning extends Warning
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2181 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2182 SimpleExtendsException(PyExc_Warning, ImportWarning,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2183 "Base class for warnings about probable mistakes in module imports");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2184
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2185
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2186 /*
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2187 * UnicodeWarning extends Warning
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2188 */
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2189 SimpleExtendsException(PyExc_Warning, UnicodeWarning,
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2190 "Base class for warnings about Unicode related problems, mostly\n"
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2191 "related to conversion problems.");
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2192
65624 39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2193
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2194 /*
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2195 * BytesWarning extends Warning
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2196 */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2197 SimpleExtendsException(PyExc_Warning, BytesWarning,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2198 "Base class for warnings about bytes and buffer related problems, mostly\n"
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2199 "related to conversion from str or comparing to str.");
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2200
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2201
65624 39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2202 /*
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2203 * ResourceWarning extends Warning
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2204 */
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2205 SimpleExtendsException(PyExc_Warning, ResourceWarning,
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2206 "Base class for warnings about resource usage.");
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2207
39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2208
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2209
43292 876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2210 /* Pre-computed RuntimeError instance for when recursion depth is reached.
876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2211 Meant to be used when normalizing the exception for exceeding the recursion
876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2212 depth will cause its own infinite recursion.
876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2213 */
876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2214 PyObject *PyExc_RecursionErrorInst = NULL;
876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2215
74506 5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2216 #define PRE_INIT(TYPE) \
5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2217 if (!(_PyExc_ ## TYPE.tp_flags & Py_TPFLAGS_READY)) { \
5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2218 if (PyType_Ready(&_PyExc_ ## TYPE) < 0) \
5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2219 Py_FatalError("exceptions bootstrapping error."); \
5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2220 Py_INCREF(PyExc_ ## TYPE); \
5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2221 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2222
74506 5ffa409af22e Fix refleaks in test_capi Antoine Pitrou <solipsis@pitrou.net> parents: 74498 diff changeset	2223 #define POST_INIT(TYPE) \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2224 if (PyDict_SetItemString(bdict, # TYPE, PyExc_ ## TYPE)) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2225 Py_FatalError("Module dictionary insertion problem.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2226
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2227 #define INIT_ALIAS(NAME, TYPE) Py_INCREF(PyExc_ ## TYPE); \
74508 29a28018e567 Fix some of the remaining test_capi refleaks Antoine Pitrou <solipsis@pitrou.net> parents: 74507 diff changeset	2228 Py_XDECREF(PyExc_ ## NAME); \
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2229 PyExc_ ## NAME = PyExc_ ## TYPE; \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2230 if (PyDict_SetItemString(bdict, # NAME, PyExc_ ## NAME)) \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2231 Py_FatalError("Module dictionary insertion problem.");
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2232
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2233 #define ADD_ERRNO(TYPE, CODE) { \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2234 PyObject *_code = PyLong_FromLong(CODE); \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2235 assert(_PyObject_RealIsSubclass(PyExc_ ## TYPE, PyExc_OSError)); \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2236 if (!_code \|\| PyDict_SetItem(errnomap, _code, PyExc_ ## TYPE)) \
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2237 Py_FatalError("errmap insertion problem."); \
74508 29a28018e567 Fix some of the remaining test_capi refleaks Antoine Pitrou <solipsis@pitrou.net> parents: 74507 diff changeset	2238 Py_DECREF(_code); \
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2239 }
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2240
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2241 #ifdef MS_WINDOWS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2242 #include <Winsock2.h>
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2243 #if defined(WSAEALREADY) && !defined(EALREADY)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2244 #define EALREADY WSAEALREADY
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2245 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2246 #if defined(WSAECONNABORTED) && !defined(ECONNABORTED)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2247 #define ECONNABORTED WSAECONNABORTED
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2248 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2249 #if defined(WSAECONNREFUSED) && !defined(ECONNREFUSED)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2250 #define ECONNREFUSED WSAECONNREFUSED
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2251 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2252 #if defined(WSAECONNRESET) && !defined(ECONNRESET)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2253 #define ECONNRESET WSAECONNRESET
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2254 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2255 #if defined(WSAEINPROGRESS) && !defined(EINPROGRESS)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2256 #define EINPROGRESS WSAEINPROGRESS
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2257 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2258 #if defined(WSAESHUTDOWN) && !defined(ESHUTDOWN)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2259 #define ESHUTDOWN WSAESHUTDOWN
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2260 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2261 #if defined(WSAETIMEDOUT) && !defined(ETIMEDOUT)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2262 #define ETIMEDOUT WSAETIMEDOUT
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2263 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2264 #if defined(WSAEWOULDBLOCK) && !defined(EWOULDBLOCK)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2265 #define EWOULDBLOCK WSAEWOULDBLOCK
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2266 #endif
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2267 #endif /* MS_WINDOWS */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2268
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	2269 void
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2270 _PyExc_Init(void)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2271 {
40949 e759fd8d95ae Remove the exceptions builtin module, all the exceptions are already builtin. Neal Norwitz <nnorwitz@gmail.com> parents: 40909 diff changeset	2272 PyObject bltinmod, bdict;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2273
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2274 PRE_INIT(BaseException)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2275 PRE_INIT(Exception)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2276 PRE_INIT(TypeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2277 PRE_INIT(StopIteration)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2278 PRE_INIT(GeneratorExit)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2279 PRE_INIT(SystemExit)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2280 PRE_INIT(KeyboardInterrupt)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2281 PRE_INIT(ImportError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2282 PRE_INIT(OSError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2283 PRE_INIT(EOFError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2284 PRE_INIT(RuntimeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2285 PRE_INIT(NotImplementedError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2286 PRE_INIT(NameError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2287 PRE_INIT(UnboundLocalError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2288 PRE_INIT(AttributeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2289 PRE_INIT(SyntaxError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2290 PRE_INIT(IndentationError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2291 PRE_INIT(TabError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2292 PRE_INIT(LookupError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2293 PRE_INIT(IndexError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2294 PRE_INIT(KeyError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2295 PRE_INIT(ValueError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2296 PRE_INIT(UnicodeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2297 PRE_INIT(UnicodeEncodeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2298 PRE_INIT(UnicodeDecodeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2299 PRE_INIT(UnicodeTranslateError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2300 PRE_INIT(AssertionError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2301 PRE_INIT(ArithmeticError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2302 PRE_INIT(FloatingPointError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2303 PRE_INIT(OverflowError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2304 PRE_INIT(ZeroDivisionError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2305 PRE_INIT(SystemError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2306 PRE_INIT(ReferenceError)
42669 2c51be9904de Code review of the new buffer protocol. Mostly add questions that should Neal Norwitz <nnorwitz@gmail.com> parents: 42665 diff changeset	2307 PRE_INIT(BufferError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2308 PRE_INIT(MemoryError)
48437 fa34088380f9 #3295 actually define PyExc_BufferError Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	2309 PRE_INIT(BufferError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2310 PRE_INIT(Warning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2311 PRE_INIT(UserWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2312 PRE_INIT(DeprecationWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2313 PRE_INIT(PendingDeprecationWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2314 PRE_INIT(SyntaxWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2315 PRE_INIT(RuntimeWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2316 PRE_INIT(FutureWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2317 PRE_INIT(ImportWarning)
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2318 PRE_INIT(UnicodeWarning)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2319 PRE_INIT(BytesWarning)
65624 39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2320 PRE_INIT(ResourceWarning)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2321
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2322 /* OSError subclasses */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2323 PRE_INIT(ConnectionError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2324
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2325 PRE_INIT(BlockingIOError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2326 PRE_INIT(BrokenPipeError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2327 PRE_INIT(ChildProcessError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2328 PRE_INIT(ConnectionAbortedError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2329 PRE_INIT(ConnectionRefusedError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2330 PRE_INIT(ConnectionResetError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2331 PRE_INIT(FileExistsError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2332 PRE_INIT(FileNotFoundError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2333 PRE_INIT(IsADirectoryError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2334 PRE_INIT(NotADirectoryError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2335 PRE_INIT(InterruptedError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2336 PRE_INIT(PermissionError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2337 PRE_INIT(ProcessLookupError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2338 PRE_INIT(TimeoutError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2339
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 43866 diff changeset	2340 bltinmod = PyImport_ImportModule("builtins");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2341 if (bltinmod == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2342 Py_FatalError("exceptions bootstrapping error.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2343 bdict = PyModule_GetDict(bltinmod);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2344 if (bdict == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2345 Py_FatalError("exceptions bootstrapping error.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2346
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2347 POST_INIT(BaseException)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2348 POST_INIT(Exception)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2349 POST_INIT(TypeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2350 POST_INIT(StopIteration)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2351 POST_INIT(GeneratorExit)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2352 POST_INIT(SystemExit)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2353 POST_INIT(KeyboardInterrupt)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2354 POST_INIT(ImportError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2355 POST_INIT(OSError)
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2356 INIT_ALIAS(EnvironmentError, OSError)
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2357 INIT_ALIAS(IOError, OSError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2358 #ifdef MS_WINDOWS
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2359 INIT_ALIAS(WindowsError, OSError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2360 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2361 #ifdef __VMS
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2362 INIT_ALIAS(VMSError, OSError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2363 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2364 POST_INIT(EOFError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2365 POST_INIT(RuntimeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2366 POST_INIT(NotImplementedError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2367 POST_INIT(NameError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2368 POST_INIT(UnboundLocalError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2369 POST_INIT(AttributeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2370 POST_INIT(SyntaxError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2371 POST_INIT(IndentationError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2372 POST_INIT(TabError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2373 POST_INIT(LookupError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2374 POST_INIT(IndexError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2375 POST_INIT(KeyError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2376 POST_INIT(ValueError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2377 POST_INIT(UnicodeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2378 POST_INIT(UnicodeEncodeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2379 POST_INIT(UnicodeDecodeError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2380 POST_INIT(UnicodeTranslateError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2381 POST_INIT(AssertionError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2382 POST_INIT(ArithmeticError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2383 POST_INIT(FloatingPointError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2384 POST_INIT(OverflowError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2385 POST_INIT(ZeroDivisionError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2386 POST_INIT(SystemError)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2387 POST_INIT(ReferenceError)
42669 2c51be9904de Code review of the new buffer protocol. Mostly add questions that should Neal Norwitz <nnorwitz@gmail.com> parents: 42665 diff changeset	2388 POST_INIT(BufferError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2389 POST_INIT(MemoryError)
48437 fa34088380f9 #3295 actually define PyExc_BufferError Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	2390 POST_INIT(BufferError)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2391 POST_INIT(Warning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2392 POST_INIT(UserWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2393 POST_INIT(DeprecationWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2394 POST_INIT(PendingDeprecationWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2395 POST_INIT(SyntaxWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2396 POST_INIT(RuntimeWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2397 POST_INIT(FutureWarning)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2398 POST_INIT(ImportWarning)
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2399 POST_INIT(UnicodeWarning)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43696 diff changeset	2400 POST_INIT(BytesWarning)
65624 39b9e9de372b Add a new warning gategory, ResourceWarning, as discussed on python-dev. It is silent by default, Georg Brandl <georg@python.org> parents: 62443 diff changeset	2401 POST_INIT(ResourceWarning)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2402
74509 44d8aa3c1003 Fix some of the remaining test_capi leaks Antoine Pitrou <solipsis@pitrou.net> parents: 74508 diff changeset	2403 if (!errnomap) {
44d8aa3c1003 Fix some of the remaining test_capi leaks Antoine Pitrou <solipsis@pitrou.net> parents: 74508 diff changeset	2404 errnomap = PyDict_New();
44d8aa3c1003 Fix some of the remaining test_capi leaks Antoine Pitrou <solipsis@pitrou.net> parents: 74508 diff changeset	2405 if (!errnomap)
44d8aa3c1003 Fix some of the remaining test_capi leaks Antoine Pitrou <solipsis@pitrou.net> parents: 74508 diff changeset	2406 Py_FatalError("Cannot allocate map from errnos to OSError subclasses");
44d8aa3c1003 Fix some of the remaining test_capi leaks Antoine Pitrou <solipsis@pitrou.net> parents: 74508 diff changeset	2407 }
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2408
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2409 /* OSError subclasses */
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2410 POST_INIT(ConnectionError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2411
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2412 POST_INIT(BlockingIOError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2413 ADD_ERRNO(BlockingIOError, EAGAIN);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2414 ADD_ERRNO(BlockingIOError, EALREADY);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2415 ADD_ERRNO(BlockingIOError, EINPROGRESS);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2416 ADD_ERRNO(BlockingIOError, EWOULDBLOCK);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2417 POST_INIT(BrokenPipeError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2418 ADD_ERRNO(BrokenPipeError, EPIPE);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2419 ADD_ERRNO(BrokenPipeError, ESHUTDOWN);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2420 POST_INIT(ChildProcessError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2421 ADD_ERRNO(ChildProcessError, ECHILD);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2422 POST_INIT(ConnectionAbortedError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2423 ADD_ERRNO(ConnectionAbortedError, ECONNABORTED);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2424 POST_INIT(ConnectionRefusedError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2425 ADD_ERRNO(ConnectionRefusedError, ECONNREFUSED);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2426 POST_INIT(ConnectionResetError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2427 ADD_ERRNO(ConnectionResetError, ECONNRESET);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2428 POST_INIT(FileExistsError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2429 ADD_ERRNO(FileExistsError, EEXIST);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2430 POST_INIT(FileNotFoundError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2431 ADD_ERRNO(FileNotFoundError, ENOENT);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2432 POST_INIT(IsADirectoryError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2433 ADD_ERRNO(IsADirectoryError, EISDIR);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2434 POST_INIT(NotADirectoryError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2435 ADD_ERRNO(NotADirectoryError, ENOTDIR);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2436 POST_INIT(InterruptedError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2437 ADD_ERRNO(InterruptedError, EINTR);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2438 POST_INIT(PermissionError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2439 ADD_ERRNO(PermissionError, EACCES);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2440 ADD_ERRNO(PermissionError, EPERM);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2441 POST_INIT(ProcessLookupError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2442 ADD_ERRNO(ProcessLookupError, ESRCH);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2443 POST_INIT(TimeoutError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2444 ADD_ERRNO(TimeoutError, ETIMEDOUT);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2445
65690 c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2446 preallocate_memerrors();
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2447
74498 ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2448 if (!PyExc_RecursionErrorInst) {
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2449 PyExc_RecursionErrorInst = BaseException_new(&_PyExc_RuntimeError, NULL, NULL);
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2450 if (!PyExc_RecursionErrorInst)
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2451 Py_FatalError("Cannot pre-allocate RuntimeError instance for "
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2452 "recursion errors");
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2453 else {
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2454 PyBaseExceptionObject *err_inst =
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2455 (PyBaseExceptionObject *)PyExc_RecursionErrorInst;
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2456 PyObject *args_tuple;
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2457 PyObject *exc_message;
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2458 exc_message = PyUnicode_FromString("maximum recursion depth exceeded");
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2459 if (!exc_message)
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2460 Py_FatalError("cannot allocate argument for RuntimeError "
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2461 "pre-allocation");
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2462 args_tuple = PyTuple_Pack(1, exc_message);
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2463 if (!args_tuple)
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2464 Py_FatalError("cannot allocate tuple for RuntimeError "
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2465 "pre-allocation");
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2466 Py_DECREF(exc_message);
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2467 if (BaseException_init(err_inst, args_tuple, NULL))
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2468 Py_FatalError("init of pre-allocated RuntimeError failed");
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2469 Py_DECREF(args_tuple);
ab5b47bf6711 Fix leaking a RuntimeError objects when creating sub-interpreters Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	2470 }
43292 876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2471 }
876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43188 diff changeset	2472
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2473 Py_DECREF(bltinmod);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2474 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2475
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2476 void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2477 _PyExc_Fini(void)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2478 {
65690 c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2479 Py_CLEAR(PyExc_RecursionErrorInst);
c6d86439aa91 Merged revisions 85896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62448 diff changeset	2480 free_preallocated_memerrors();
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72703 diff changeset	2481 Py_CLEAR(errnomap);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2482 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/exceptions.c @ 74588:dfd05348331c