Update tests

Author: neonene

Lib/test/datetimetester.py

@@ -7272,7 +7272,7 @@ def test_update_type_cache(self):
         res = script_helper.assert_python_ok('-c', script)
         self.assertFalse(res.err)
 
-    def test_module_state_at_shutdown(self):
+    def test_static_type_at_shutdown1(self):
         # gh-132413
         script = textwrap.dedent("""
             import sys
@@ -7283,7 +7283,27 @@ def gen():
                     yield
                 finally:
                     assert not sys.modules
-                    td = _datetime.timedelta(days=1)  # crash
+                    td = _datetime.timedelta(days=1)
+                    assert td.days == 1
+                    assert not sys.modules
+
+            it = gen()
+            next(it)
+            """)
+        res = script_helper.assert_python_ok('-c', script)
+        self.assertFalse(res.err)
+
+    def test_static_type_at_shutdown2(self):
+        script = textwrap.dedent("""
+            import sys
+            from _datetime import timedelta
+
+            def gen():
+                try:
+                    yield
+                finally:
+                    assert not sys.modules
+                    td = timedelta(days=1)
                     assert td.days == 1
                     assert not sys.modules
 
@@ -7301,8 +7321,9 @@ def test_remain_only_one_module(self):
             ws = weakref.WeakSet()
             for _ in range(3):
                 import _datetime
+                td = _datetime.timedelta
                 ws.add(_datetime)
-                del sys.modules["_datetime"]
+                del sys.modules['_datetime']
                 del _datetime
                 gc.collect()
                 assert len(ws) == 1

Modules/_datetimemodule.c

@@ -165,19 +165,7 @@ _get_current_state(PyObject **p_mod)
 {
     PyInterpreterState *interp = PyInterpreterState_Get();
     PyObject *mod = get_current_module(interp, NULL);
-    if (mod == NULL) {
-        assert(!PyErr_Occurred());
-        if (PyErr_Occurred()) {
-            return NULL;
-        }
-        assert(!_Py_IsInterpreterFinalizing(interp));
-        /* The static types can outlive the module,
-         * so we must re-import the module. */
-        mod = PyImport_ImportModule("_datetime");
-        if (mod == NULL) {
-            return NULL;
-        }
-    }
+    assert (mod != NULL);
     datetime_state *st = get_module_state(mod);
     *p_mod = mod;
     return st;