mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #1545463: At shutdown, defer finalization of codec modules so that stderr remains usable.

Browse source 
(should fix Windows buildbot failures on test_gc)
This commit is contained in:
Antoine Pitrou 2013-05-08 13:23:25 +02:00
parent d62a514386
commit 070cb3c9be
5 changed files with 96 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Python/_warnings.c
View file

@ -800,8 +800,8 @@ PyErr_WarnExplicit(PyObject *category, const char *text,
goto exit;
if (module_str != NULL) {
module = PyUnicode_FromString(module_str);
if (module == NULL)
goto exit;
if (module == NULL)
goto exit;
}
if (category == NULL)
@ -820,6 +820,49 @@ PyErr_WarnExplicit(PyObject *category, const char *text,
return ret;
}
int
PyErr_WarnExplicitFormat(PyObject *category,
const char *filename_str, int lineno,
const char *module_str, PyObject *registry,
const char *format, ...)
{
PyObject *message;
PyObject *module = NULL;
PyObject *filename = PyUnicode_DecodeFSDefault(filename_str);
int ret = -1;
va_list vargs;
if (filename == NULL)
goto exit;
if (module_str != NULL) {
module = PyUnicode_FromString(module_str);
if (module == NULL)
goto exit;
}
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
message = PyUnicode_FromFormatV(format, vargs);
if (message != NULL) {
PyObject *res;
res = warn_explicit(category, message, filename, lineno,
module, registry, NULL);
Py_DECREF(message);
if (res != NULL) {
Py_DECREF(res);
ret = 0;
}
}
va_end(vargs);
exit:
Py_XDECREF(module);
Py_XDECREF(filename);
return ret;
}
PyDoc_STRVAR(warn_doc,
"Issue a warning, or maybe ignore it or raise an exception.");