Author: brett.cannon
Date: Mon Feb 26 23:01:14 2007
New Revision: 53964
Modified:
python/branches/p3yk/Misc/NEWS
python/branches/p3yk/Python/ceval.c
Log:
Make it so TypeError is raised if an instance of an object is put in an
'except' clause. Also refactor some code to help keep Neal Norwitz happy.
Modified: python/branches/p3yk/Misc/NEWS
==============================================================================
--- python/branches/p3yk/Misc/NEWS (original)
+++ python/branches/p3yk/Misc/NEWS Mon Feb 26 23:01:14 2007
@@ -32,7 +32,7 @@
functionality formerly known as raw_input(); the name raw_input()
is no longer defined.
-- Objects listed in an 'except' clause must inherit from BaseException.
+- Classes listed in an 'except' clause must inherit from BaseException.
- PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone;
and .keys(), .items(), .values() return dict views.
Modified: python/branches/p3yk/Python/ceval.c
==============================================================================
--- python/branches/p3yk/Python/ceval.c (original)
+++ python/branches/p3yk/Python/ceval.c Mon Feb 26 23:01:14 2007
@@ -3895,23 +3895,8 @@
}
}
-/*
- Return a true value if the exception is allowed to be in an 'except' clause,
- otherwise return a false value.
-*/
-static int
-can_catch_exc(PyObject *exc)
-{
- if (!(PyExceptionClass_Check(exc) || PyExceptionInstance_Check(exc))) {
- PyErr_SetString(PyExc_TypeError,
- "catching an object must be a class or "
- "instance of BaseException");
- return 0;
- }
- else {
- return 1;
- }
-}
+#define CANNOT_CATCH_MSG "catching classes that do not inherit from"\
+ "BaseException is not allowed"
static PyObject *
cmp_outcome(int op, register PyObject *v, register PyObject *w)
@@ -3941,13 +3926,17 @@
length = PyTuple_Size(w);
for (i = 0; i < length; i += 1) {
PyObject *exc = PyTuple_GET_ITEM(w, i);
- if (!can_catch_exc(exc)) {
+ if (!PyExceptionClass_Check(exc)) {
+ PyErr_SetString(PyExc_TypeError,
+ CANNOT_CATCH_MSG);
return NULL;
}
}
}
else {
- if (!can_catch_exc(w)) {
+ if (!PyExceptionClass_Check(w)) {
+ PyErr_SetString(PyExc_TypeError,
+ CANNOT_CATCH_MSG);
return NULL;
}
}
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
