Issue #18608: Avoid keeping a strong reference to the locale module inside the _io module.

This commit is contained in:
Antoine Pitrou 2013-08-01 21:04:50 +02:00
parent 2d350fd8af
commit 932ff83682
4 changed files with 51 additions and 27 deletions

View file

@ -179,6 +179,9 @@ Core and Builtins
Library Library
------- -------
- Issue #18608: Avoid keeping a strong reference to the locale module
inside the _io module.
- Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters, - Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters,
and make it GC-aware. and make it GC-aware.

View file

@ -533,6 +533,31 @@ _PyIO_ConvertSsize_t(PyObject *obj, void *result) {
} }
PyObject *
_PyIO_get_locale_module(_PyIO_State *state)
{
PyObject *mod;
if (state->locale_module != NULL) {
assert(PyWeakref_CheckRef(state->locale_module));
mod = PyWeakref_GET_OBJECT(state->locale_module);
if (mod != Py_None) {
Py_INCREF(mod);
return mod;
}
Py_CLEAR(state->locale_module);
}
mod = PyImport_ImportModule("locale");
if (mod == NULL)
return NULL;
state->locale_module = PyWeakref_NewRef(mod, NULL);
if (state->locale_module == NULL) {
Py_DECREF(mod);
return NULL;
}
return mod;
}
static int static int
iomodule_traverse(PyObject *mod, visitproc visit, void *arg) { iomodule_traverse(PyObject *mod, visitproc visit, void *arg) {
_PyIO_State *state = IO_MOD_STATE(mod); _PyIO_State *state = IO_MOD_STATE(mod);

View file

@ -137,6 +137,8 @@ typedef struct {
#define IO_MOD_STATE(mod) ((_PyIO_State *)PyModule_GetState(mod)) #define IO_MOD_STATE(mod) ((_PyIO_State *)PyModule_GetState(mod))
#define IO_STATE IO_MOD_STATE(PyState_FindModule(&_PyIO_Module)) #define IO_STATE IO_MOD_STATE(PyState_FindModule(&_PyIO_Module))
extern PyObject *_PyIO_get_locale_module(_PyIO_State *);
extern PyObject *_PyIO_str_close; extern PyObject *_PyIO_str_close;
extern PyObject *_PyIO_str_closed; extern PyObject *_PyIO_str_closed;
extern PyObject *_PyIO_str_decode; extern PyObject *_PyIO_str_decode;

View file

@ -917,35 +917,29 @@ textiowrapper_init(textio *self, PyObject *args, PyObject *kwds)
} }
} }
if (encoding == NULL && self->encoding == NULL) { if (encoding == NULL && self->encoding == NULL) {
if (state->locale_module == NULL) { PyObject *locale_module = _PyIO_get_locale_module(state);
state->locale_module = PyImport_ImportModule("locale"); if (locale_module == NULL)
if (state->locale_module == NULL) goto catch_ImportError;
goto catch_ImportError; self->encoding = _PyObject_CallMethodId(
else locale_module, &PyId_getpreferredencoding, "O", Py_False);
goto use_locale; Py_DECREF(locale_module);
} if (self->encoding == NULL) {
else { catch_ImportError:
use_locale: /*
self->encoding = _PyObject_CallMethodId( Importing locale can raise a ImportError because of
state->locale_module, &PyId_getpreferredencoding, "O", Py_False); _functools, and locale.getpreferredencoding can raise a
if (self->encoding == NULL) { ImportError if _locale is not available. These will happen
catch_ImportError: during module building.
/* */
Importing locale can raise a ImportError because of if (PyErr_ExceptionMatches(PyExc_ImportError)) {
_functools, and locale.getpreferredencoding can raise a PyErr_Clear();
ImportError if _locale is not available. These will happen self->encoding = PyUnicode_FromString("ascii");
during module building.
*/
if (PyErr_ExceptionMatches(PyExc_ImportError)) {
PyErr_Clear();
self->encoding = PyUnicode_FromString("ascii");
}
else
goto error;
} }
else if (!PyUnicode_Check(self->encoding)) else
Py_CLEAR(self->encoding); goto error;
} }
else if (!PyUnicode_Check(self->encoding))
Py_CLEAR(self->encoding);
} }
if (self->encoding != NULL) { if (self->encoding != NULL) {
encoding = _PyUnicode_AsString(self->encoding); encoding = _PyUnicode_AsString(self->encoding);