Skip to content

Commit 127c1d2

Browse files
neoneneneonene
authored
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()).
1 parent fabcf6b commit 127c1d2

File tree

8 files changed

+24
-8
lines changed

8 files changed

+24
-8
lines changed

‎Include/internal/pycore_global_objects_fini_generated.h‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_global_strings.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ struct _Py_global_strings {
266266
STRUCT_FOR_ID(_showwarnmsg)
267267
STRUCT_FOR_ID(_shutdown)
268268
STRUCT_FOR_ID(_slotnames)
269+
STRUCT_FOR_ID(_strptime)
269270
STRUCT_FOR_ID(_strptime_datetime)
270271
STRUCT_FOR_ID(_swappedbytes_)
271272
STRUCT_FOR_ID(_type_)

‎Include/internal/pycore_runtime_init_generated.h‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_unicodeobject_generated.h‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/test/test_embed.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,15 @@ def test_ucnhash_capi_reset(self):
404404
out, err = self.run_embedded_interpreter("test_repeated_init_exec", code)
405405
self.assertEqual(out, '9\n' * INIT_LOOPS)
406406

407+
def test_datetime_reset_strptime(self):
408+
code = (
409+
"import datetime;"
410+
"d = datetime.datetime.strptime('2000-01-01', '%Y-%m-%d');"
411+
"print(d.strftime('%Y%m%d'))"
412+
)
413+
out, err = self.run_embedded_interpreter("test_repeated_init_exec", code)
414+
self.assertEqual(out, '20000101\n' * INIT_LOOPS)
415+
407416

408417
@unittest.skipIf(_testinternalcapi is None, "requires _testinternalcapi")
409418
class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):

‎Misc/NEWS.d/next/Library/2024-06-07-11-23-31.gh-issue-71587.IjFajE.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix crash in C version of :meth:`datetime.datetime.strptime` when called again
2+
on the restarted interpreter.

‎Modules/_datetimemodule.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5514,19 +5514,19 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
55145514
static PyObject *
55155515
datetime_strptime(PyObject *cls, PyObject *args)
55165516
{
5517-
static PyObject *module = NULL;
5518-
PyObject *string, *format;
5517+
PyObject *string, *format, *result;
55195518

55205519
if (!PyArg_ParseTuple(args, "UU:strptime", &string, &format))
55215520
return NULL;
55225521

5522+
PyObject *module = PyImport_Import(&_Py_ID(_strptime));
55235523
if (module == NULL) {
5524-
module = PyImport_ImportModule("_strptime");
5525-
if (module == NULL)
5526-
return NULL;
5524+
return NULL;
55275525
}
5528-
return PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime),
5529-
cls, string, format, NULL);
5526+
result = PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime),
5527+
cls, string, format, NULL);
5528+
Py_DECREF(module);
5529+
return result;
55305530
}
55315531

55325532
/* Return new datetime from date/datetime and time arguments. */

‎Tools/c-analyzer/cpython/globals-to-fix.tsv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ Modules/xxmodule.c - ErrorObject -
393393

394394
## initialized once
395395
Modules/_cursesmodule.c - ModDict -
396-
Modules/_datetimemodule.c datetime_strptime module -
397396

398397
## state
399398
Modules/_datetimemodule.c - _datetime_global_state -

0 commit comments

Comments
 (0)