Add subinterp tests

Author: neonene

Lib/test/datetimetester.py

@@ -7313,6 +7313,60 @@ def gen():
         res = script_helper.assert_python_ok('-c', script)
         self.assertFalse(res.err)
 
+    def test_static_type_at_shutdown3(self):
+        script = textwrap.dedent(f'''
+            import textwrap
+            from test import support
+
+            subinterp_script = textwrap.dedent(f"""
+                from _testcapi import get_delta_type
+                # Test without calling test_datetime_capi() in subinterp
+                timedelta = get_delta_type()
+
+                def gen():
+                     try:
+                         yield
+                     finally:
+                         timedelta(days=1)
+
+                it = gen()
+                next(it)
+            """)
+
+            import _testcapi
+            _testcapi.test_datetime_capi()
+            ret = support.run_in_subinterp(subinterp_script)
+            assert ret == 0
+        ''')
+
+        res = script_helper.assert_python_ok('-c', script)
+        self.assertIn(b'ImportError: sys.meta_path is None', res.err)
+
+    def test_static_type_before_shutdown(self):
+        script = textwrap.dedent(f'''
+            import textwrap
+            from test import support
+
+            subinterp_script = textwrap.dedent(f"""
+                from _testcapi import get_delta_type
+                # Test without calling test_datetime_capi() in subinterp
+
+                import sys
+                assert '_datetime' not in sys.modules
+                timedelta = get_delta_type()
+                timedelta(days=1)
+                assert '_datetime' in sys.modules
+            """)
+
+            import _testcapi
+            _testcapi.test_datetime_capi()
+            ret = support.run_in_subinterp(subinterp_script)
+            assert ret == 0
+        ''')
+
+        res = script_helper.assert_python_ok('-c', script)
+        self.assertFalse(res.err)
+
     def test_remain_only_one_module(self):
         script = textwrap.dedent("""
             import sys

Modules/_datetimemodule.c

@@ -175,8 +175,7 @@ _get_current_state(PyObject **p_mod)
         mod = PyImport_ImportModule("_datetime");
         if (mod == NULL) {
             assert(_Py_IsInterpreterFinalizing(interp));
-            /* Ask users to take care about the unlikely case
-             * that happened after restarting the interpreter. */
+            /* We do not take care of the unlikely case. */
             return NULL;
         }
     }

Modules/_testcapi/datetime.c

@@ -453,6 +453,12 @@ test_PyDateTime_DELTA_GET(PyObject *self, PyObject *obj)
     return Py_BuildValue("(iii)", days, seconds, microseconds);
 }
 
+static PyObject *
+get_delta_type(PyObject *self, PyObject *args)
+{
+    return PyDateTimeAPI ? Py_NewRef(PyDateTimeAPI->DeltaType) : Py_None;
+}
+
 static PyMethodDef test_methods[] = {
     {"PyDateTime_DATE_GET",         test_PyDateTime_DATE_GET,       METH_O},
     {"PyDateTime_DELTA_GET",        test_PyDateTime_DELTA_GET,      METH_O},
@@ -469,6 +475,7 @@ static PyMethodDef test_methods[] = {
     {"get_datetime_fromdateandtimeandfold", get_datetime_fromdateandtimeandfold, METH_VARARGS},
     {"get_datetime_fromtimestamp",  get_datetime_fromtimestamp,     METH_VARARGS},
     {"get_delta_fromdsu",           get_delta_fromdsu,              METH_VARARGS},
+    {"get_delta_type",               get_delta_type,                METH_NOARGS},
     {"get_time_fromtime",           get_time_fromtime,              METH_VARARGS},
     {"get_time_fromtimeandfold",    get_time_fromtimeandfold,       METH_VARARGS},
     {"get_timezone_utc_capi",       get_timezone_utc_capi,          METH_VARARGS},