Kaydet (Commit) 37aa0661 authored tarafından Neal Norwitz's avatar Neal Norwitz

As discussed briefly on python-dev, add Pending Deprecation Warning

when a string exception is raised.  Note that raising string exceptions
is deprecated in an exception message.
üst 8e914d9a
......@@ -2733,7 +2733,8 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
/* Raising builtin string is deprecated but still allowed --
* do nothing. Raising an instance of a new-style str
* subclass is right out. */
;
PyErr_Warn(PyExc_PendingDeprecationWarning,
"raising a string exception is deprecated");
else if (PyClass_Check(type))
PyErr_NormalizeException(&type, &value, &tb);
......@@ -2757,8 +2758,9 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
/* Not something you can raise. You get an exception
anyway, just not what you specified :-) */
PyErr_Format(PyExc_TypeError,
"exceptions must be strings, classes, or "
"instances, not %s", type->ob_type->tp_name);
"exceptions must be classes, instances, or "
"strings (deprecated), not %s",
type->ob_type->tp_name);
goto raise_error;
}
PyErr_Restore(type, value, tb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment