mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Check the return code for PyErr_Warn() when warning about raising string

Browse source 
exceptions.  This was triggered when 'warnings' had a filter set to "error"
that caught the string exception deprecation warning.
This commit is contained in:
Brett Cannon 2006-02-27 23:39:10 +00:00
parent a7444f47b2
commit a7446e3438
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -12,6 +12,10 @@ What's New in Python 2.5 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- Properly check if 'warnings' raises an exception (usually when a filter set
to "error" is triggered) when raising a warning for raising string
exceptions.
- CO_GENERATOR_ALLOWED is no longer defined, this behavior is the default. - CO_GENERATOR_ALLOWED is no longer defined, this behavior is the default.
The name was removed from Include/code.h. The name was removed from Include/code.h.

9
Python/ceval.c
View file

@ -2997,13 +2997,14 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
Py_DECREF(tmp); Py_DECREF(tmp);
} }
if (PyString_CheckExact(type)) if (PyString_CheckExact(type)) {
/* Raising builtin string is deprecated but still allowed -- /* Raising builtin string is deprecated but still allowed --
* do nothing. Raising an instance of a new-style str * do nothing. Raising an instance of a new-style str
* subclass is right out. */ * subclass is right out. */
PyErr_Warn(PyExc_PendingDeprecationWarning, if (-1 == PyErr_Warn(PyExc_PendingDeprecationWarning,
"raising a string exception is deprecated"); "raising a string exception is deprecated"))
goto raise_error;
}
else if (PyClass_Check(type)) else if (PyClass_Check(type))
PyErr_NormalizeException(&type, &value, &tb); PyErr_NormalizeException(&type, &value, &tb);