summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-28 23:06:57 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-28 23:06:57 (GMT)
commit98e2b452975f13b13052aeb9d166ed8a3ef45063 (patch)
tree2d7ee32804bc590346f62f45bcb1e46b0221f90b /Include
parentd7a3ab962bb773258ad1906c26af1ca75ed7daf7 (diff)
downloadcpython-98e2b452975f13b13052aeb9d166ed8a3ef45063.zip
cpython-98e2b452975f13b13052aeb9d166ed8a3ef45063.tar.gz
cpython-98e2b452975f13b13052aeb9d166ed8a3ef45063.tar.bz2
Merged revisions 85896 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85896 | antoine.pitrou | 2010-10-29 00:56:58 +0200 (ven., 29 oct. 2010) | 4 lines Issue #5437: A preallocated MemoryError instance should not hold traceback data (including local variables caught in the stack trace) alive infinitely. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/pyerrors.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 66a7030..3c3afab 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -153,7 +153,6 @@ PyAPI_DATA(PyObject *) PyExc_VMSError;
PyAPI_DATA(PyObject *) PyExc_BufferError;
-PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst;
PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst;
/* Predefined warning categories */