[Python-checkins] r65320 - in python/trunk: Lib/test/test_exceptions.py Misc/NEWS Python/errors.c
amaury.forgeotdarc
python-checkins at python.org
Thu Jul 31 02:42:17 CEST 2008
Author: amaury.forgeotdarc
Date: Thu Jul 31 02:42:16 2008
New Revision: 65320
Log:
#2542: now that issubclass() may call arbitrary code,
make sure that PyErr_ExceptionMatches returns 0 when an exception occurs there.
Modified:
python/trunk/Lib/test/test_exceptions.py
python/trunk/Misc/NEWS
python/trunk/Python/errors.c
Modified: python/trunk/Lib/test/test_exceptions.py
==============================================================================
--- python/trunk/Lib/test/test_exceptions.py (original)
+++ python/trunk/Lib/test/test_exceptions.py Thu Jul 31 02:42:16 2008
@@ -6,13 +6,21 @@
import pickle, cPickle
from test.test_support import (TESTFN, unlink, run_unittest,
- catch_warning)
+ catch_warning, captured_output)
from test.test_pep352 import ignore_message_warning
# XXX This is not really enough, each *operation* should be tested!
class ExceptionTests(unittest.TestCase):
+ def test00(self):
+ try:
+ sys.exit(ValueError('aaa'))
+ except SystemExit:
+ pass
+ finally:
+ pass
+
def testReload(self):
# Reloading the built-in exceptions module failed prior to Py2.2, while it
# should act the same as reloading built-in sys.
@@ -344,6 +352,31 @@
self.failUnless(unicode(Exception(u'a')))
self.failUnless(unicode(Exception(u'\xe1')))
+ def test_badisinstance(self):
+ # Bug #2542: if issubclass(e, MyException) raises an exception,
+ # it should be ignored
+ class Meta(type):
+ def __subclasscheck__(cls, subclass):
+ raise ValueError()
+
+ class MyException(Exception):
+ __metaclass__ = Meta
+ pass
+
+ with captured_output("stderr") as stderr:
+ try:
+ raise KeyError()
+ except MyException, e:
+ self.fail("exception should not be a MyException")
+ except KeyError:
+ pass
+ except:
+ self.fail("Should have raised TypeError")
+ else:
+ self.fail("Should have raised TypeError")
+ self.assertEqual(stderr.getvalue(),
+ "Exception ValueError: ValueError() in "
+ "<type 'exceptions.KeyError'> ignored\n")
def test_main():
run_unittest(ExceptionTests)
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Thu Jul 31 02:42:16 2008
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #2542: Now that issubclass() may call arbitrary code, ensure that
+ PyErr_ExceptionMatches returns 0 when an exception occurs there.
+
- Issue #1819: function calls with several named parameters are now on
average 35% faster (as measured by pybench).
Modified: python/trunk/Python/errors.c
==============================================================================
--- python/trunk/Python/errors.c (original)
+++ python/trunk/Python/errors.c Thu Jul 31 02:42:16 2008
@@ -106,9 +106,18 @@
err = PyExceptionInstance_Class(err);
if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) {
- /* problems here!? not sure PyObject_IsSubclass expects to
- be called with an exception pending... */
- return PyObject_IsSubclass(err, exc);
+ int res = 0;
+ PyObject *exception, *value, *tb;
+ PyErr_Fetch(&exception, &value, &tb);
+ res = PyObject_IsSubclass(err, exc);
+ /* This function must not fail, so print the error here */
+ if (res == -1) {
+ PyErr_WriteUnraisable(err);
+ /* issubclass did not succeed */
+ res = 0;
+ }
+ PyErr_Restore(exception, value, tb);
+ return res;
}
return err == exc;
More information about the Python-checkins
mailing list