python · ericsnowcurrently · Jun 12, 2024 · Jun 7, 2024 · Jun 7, 2024 · Jun 7, 2024
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -404,6 +404,15 @@ def test_ucnhash_capi_reset(self):
        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):

diff --git a/Misc/NEWS.d/next/Library/2024-06-07-11-23-31.gh-issue-71587.IjFajE.rst b/Misc/NEWS.d/next/Library/2024-06-07-11-23-31.gh-issue-71587.IjFajE.rst
@@ -0,0 +1,2 @@
+Fix crash in C version of :meth:`datetime.datetime.strptime` when called again
+on the restarted interpreter.
@@ -50,6 +50,9 @@ typedef struct {

    /* The interned Unix epoch datetime instance */
    PyObject *epoch;
+
+    /* _strptime module */
+    PyObject *strptime;
 } datetime_state;

 /* The module has a fixed number of static objects, due to being exposed
@@ -5514,19 +5517,27 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
 static PyObject *
 datetime_strptime(PyObject *cls, PyObject *args)
 {
-    static PyObject *module = NULL;
    PyObject *string, *format;

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

+    PyObject *result = NULL;
+    PyObject *current_mod = NULL;
+    datetime_state *st = GET_CURRENT_STATE(current_mod);
+    PyObject *module = st->strptime;
    if (module == NULL) {
        module = PyImport_ImportModule("_strptime");
-        if (module == NULL)
-            return NULL;
+        if (module == NULL) {
+            goto exit;
+        }
+        st->strptime = module;
    }
-    return PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime),
-                                         cls, string, format, NULL);
+    result = PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime),
+                                        cls, string, format, NULL);
+exit:
+    RELEASE_CURRENT_STATE(st, current_mod);
+    return result;
 }

 /* Return new datetime from date/datetime and time arguments. */
@@ -7057,6 +7068,7 @@ init_state(datetime_state *st, PyObject *module, PyObject *old_module)
            .us_per_week = Py_NewRef(st_old->us_per_week),
            .seconds_per_day = Py_NewRef(st_old->seconds_per_day),
            .epoch = Py_NewRef(st_old->epoch),
+            .strptime = st->strptime,
        };
        return 0;
    }
@@ -7109,7 +7121,8 @@ traverse_state(datetime_state *st, visitproc visit, void *arg)
 {
    /* heap types */
    Py_VISIT(st->isocalendar_date_type);
-
+    /* containers */
+    Py_VISIT(st->strptime);
    return 0;
 }

@@ -7125,6 +7138,7 @@ clear_state(datetime_state *st)
    Py_CLEAR(st->us_per_week);
    Py_CLEAR(st->seconds_per_day);
    Py_CLEAR(st->epoch);
+    Py_CLEAR(st->strptime);
    return 0;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix crash in C version of :meth:`datetime.datetime.strptime` when called again
		on the restarted interpreter.