diff options
| -rw-r--r-- | Include/pythonrun.h | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/typeobject.c | 22 | ||||
| -rw-r--r-- | Python/pythonrun.c | 4 |
4 files changed, 22 insertions, 8 deletions
diff --git a/Include/pythonrun.h b/Include/pythonrun.h index 4d24b2d..e8a582d 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -219,6 +219,7 @@ PyAPI_FUNC(void) PyFloat_Fini(void); PyAPI_FUNC(void) PyOS_FiniInterrupts(void); PyAPI_FUNC(void) _PyGC_Fini(void); PyAPI_FUNC(void) PySlice_Fini(void); +PyAPI_FUNC(void) _PyType_Fini(void); PyAPI_DATA(PyThreadState *) _Py_Finalizing; #endif @@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1? Core and Builtins ----------------- +- Issue #17408: Avoid using an obsolete instance of the copyreg module when + the interpreter is shutdown and then started again. + - Issue #5845: Enable tab-completion in the interactive interpreter by default, thanks to a new sys.__interactivehook__. diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 5093452..aa67af8 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -7,6 +7,10 @@ #include <ctype.h> +/* Cached lookup of the copyreg module, for faster __reduce__ calls */ + +static PyObject *cached_copyreg_module = NULL; + /* Support type attribute cache */ /* The cache can keep references to the names alive for longer than @@ -69,6 +73,15 @@ PyType_ClearCache(void) } void +_PyType_Fini(void) +{ + PyType_ClearCache(); + /* Need to forget our obsolete instance of the copyreg module at + * interpreter shutdown (issue #17408). */ + Py_CLEAR(cached_copyreg_module); +} + +void PyType_Modified(PyTypeObject *type) { /* Invalidate any cached data for the specified type and all @@ -3339,19 +3352,18 @@ static PyObject * import_copyreg(void) { static PyObject *copyreg_str; - static PyObject *mod_copyreg = NULL; if (!copyreg_str) { copyreg_str = PyUnicode_InternFromString("copyreg"); if (copyreg_str == NULL) return NULL; } - if (!mod_copyreg) { - mod_copyreg = PyImport_Import(copyreg_str); + if (!cached_copyreg_module) { + cached_copyreg_module = PyImport_Import(copyreg_str); } - Py_XINCREF(mod_copyreg); - return mod_copyreg; + Py_XINCREF(cached_copyreg_module); + return cached_copyreg_module; } static PyObject * diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 40f6ab4..75f1ef6 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -524,9 +524,6 @@ Py_Finalize(void) /* Disable signal handling */ PyOS_FiniInterrupts(); - /* Clear type lookup cache */ - PyType_ClearCache(); - /* Collect garbage. This may call finalizers; it's nice to call these * before all modules are destroyed. * XXX If a __del__ or weakref callback is triggered here, and tries to @@ -632,6 +629,7 @@ Py_Finalize(void) PyFloat_Fini(); PyDict_Fini(); PySlice_Fini(); + _PyType_Fini(); /* Cleanup Unicode implementation */ _PyUnicode_Fini(); |