mirror of https://github.com/python/cpython
gh-71587: Drop local reference cache to `_strptime` module in `_datetime` (gh-120224)
The _strptime module object was cached in a static local variable (in the datetime.strptime() implementation). That's a problem when it crosses isolation boundaries, such as reinitializing the runtme or between interpreters. This change fixes the problem by dropping the static variable, instead always relying on the normal sys.modules cache (via PyImport_Import()).
This commit is contained in:
parent
fabcf6bc8f
commit
127c1d2771
|
@ -777,6 +777,7 @@ _PyStaticObjects_CheckRefcnt(PyInterpreterState *interp) {
|
|||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_showwarnmsg));
|
||||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_shutdown));
|
||||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_slotnames));
|
||||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_strptime));
|
||||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_strptime_datetime));
|
||||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_swappedbytes_));
|
||||
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(_type_));
|
||||
|
|
|
@ -266,6 +266,7 @@ struct _Py_global_strings {
|
|||
STRUCT_FOR_ID(_showwarnmsg)
|
||||
STRUCT_FOR_ID(_shutdown)
|
||||
STRUCT_FOR_ID(_slotnames)
|
||||
STRUCT_FOR_ID(_strptime)
|
||||
STRUCT_FOR_ID(_strptime_datetime)
|
||||
STRUCT_FOR_ID(_swappedbytes_)
|
||||
STRUCT_FOR_ID(_type_)
|
||||
|
|
|
@ -775,6 +775,7 @@ extern "C" {
|
|||
INIT_ID(_showwarnmsg), \
|
||||
INIT_ID(_shutdown), \
|
||||
INIT_ID(_slotnames), \
|
||||
INIT_ID(_strptime), \
|
||||
INIT_ID(_strptime_datetime), \
|
||||
INIT_ID(_swappedbytes_), \
|
||||
INIT_ID(_type_), \
|
||||
|
|
|
@ -636,6 +636,9 @@ _PyUnicode_InitStaticStrings(PyInterpreterState *interp) {
|
|||
string = &_Py_ID(_slotnames);
|
||||
assert(_PyUnicode_CheckConsistency(string, 1));
|
||||
_PyUnicode_InternInPlace(interp, &string);
|
||||
string = &_Py_ID(_strptime);
|
||||
assert(_PyUnicode_CheckConsistency(string, 1));
|
||||
_PyUnicode_InternInPlace(interp, &string);
|
||||
string = &_Py_ID(_strptime_datetime);
|
||||
assert(_PyUnicode_CheckConsistency(string, 1));
|
||||
_PyUnicode_InternInPlace(interp, &string);
|
||||
|
|
|
@ -404,6 +404,15 @@ class EmbeddingTests(EmbeddingTestsMixin, unittest.TestCase):
|
|||
out, err = self.run_embedded_interpreter("test_repeated_init_exec", code)
|
||||
self.assertEqual(out, '9\n' * INIT_LOOPS)
|
||||
|
||||
def test_datetime_reset_strptime(self):
|
||||
code = (
|
||||
"import datetime;"
|
||||
"d = datetime.datetime.strptime('2000-01-01', '%Y-%m-%d');"
|
||||
"print(d.strftime('%Y%m%d'))"
|
||||
)
|
||||
out, err = self.run_embedded_interpreter("test_repeated_init_exec", code)
|
||||
self.assertEqual(out, '20000101\n' * INIT_LOOPS)
|
||||
|
||||
|
||||
@unittest.skipIf(_testinternalcapi is None, "requires _testinternalcapi")
|
||||
class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix crash in C version of :meth:`datetime.datetime.strptime` when called again
|
||||
on the restarted interpreter.
|
|
@ -5514,19 +5514,19 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
|
|||
static PyObject *
|
||||
datetime_strptime(PyObject *cls, PyObject *args)
|
||||
{
|
||||
static PyObject *module = NULL;
|
||||
PyObject *string, *format;
|
||||
PyObject *string, *format, *result;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "UU:strptime", &string, &format))
|
||||
return NULL;
|
||||
|
||||
PyObject *module = PyImport_Import(&_Py_ID(_strptime));
|
||||
if (module == NULL) {
|
||||
module = PyImport_ImportModule("_strptime");
|
||||
if (module == NULL)
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
return PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime),
|
||||
cls, string, format, NULL);
|
||||
result = PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime),
|
||||
cls, string, format, NULL);
|
||||
Py_DECREF(module);
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Return new datetime from date/datetime and time arguments. */
|
||||
|
|
|
@ -393,7 +393,6 @@ Modules/xxmodule.c - ErrorObject -
|
|||
|
||||
## initialized once
|
||||
Modules/_cursesmodule.c - ModDict -
|
||||
Modules/_datetimemodule.c datetime_strptime module -
|
||||
|
||||
## state
|
||||
Modules/_datetimemodule.c - _datetime_global_state -
|
||||
|
|
Can't render this file because it has a wrong number of fields in line 4.
|
Loading…
Reference in New Issue