Update and pass tests

Author: neonene

Lib/test/datetimetester.py

@@ -7273,7 +7273,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
@@ -7284,7 +7284,7 @@ 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
 
@@ -7294,19 +7294,17 @@ def gen():
         res = script_helper.assert_python_ok('-c', script)
         self.assertFalse(res.err)
 
-    def test_module_state_at_shutdown2(self):
+    def test_static_type_at_shutdown2(self):
         script = textwrap.dedent("""
             import sys
-            import _datetime
-            timedelta = _datetime.timedelta
-            del _datetime
-            del sys.modules["_datetime"]
+            from _datetime import timedelta
 
             def gen():
                 try:
                     yield
                 finally:
-                    td = timedelta(days=1)  # crash
+                    assert not sys.modules
+                    td = timedelta(days=1)
                     assert td.days == 1
                     assert not sys.modules
 
@@ -7316,15 +7314,34 @@ def gen():
         res = script_helper.assert_python_ok('-c', script)
         self.assertFalse(res.err)
 
-    def test_module_state_after_gc(self):
+    def test_static_type_at_shutdown3(self):
         script = textwrap.dedent("""
+            import gc
             import sys
+            from _datetime import timedelta
+            del sys.modules['_datetime']
+            gc.collect()
+
+            def gen():
+                try:
+                    yield
+                finally:
+                    timedelta(days=1)
+
+            it = gen()
+            next(it)
+            """)
+        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("""
             import gc
-            import _datetime
-            timedelta = _datetime.timedelta
+            import sys
+            from _datetime import timedelta
             del sys.modules['_datetime']
-            del _datetime
             gc.collect()
+
             timedelta(days=1)
             assert '_datetime' in sys.modules
             """)
@@ -7339,8 +7356,9 @@ def test_module_free(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) == 0

Modules/_datetimemodule.c

@@ -150,11 +150,12 @@ _get_current_state(PyObject **p_mod)
         return st;
     }
 
-    assert(!_Py_IsInterpreterFinalizing(interp));
     /* The static types can outlive the module,
      * so we must re-import the module. */
     PyObject *mod = PyImport_ImportModule("_datetime");
     if (mod == NULL) {
+        assert(_Py_IsInterpreterFinalizing(interp));
+        /* It is not preferable to reload the module implicitly here. */
         return NULL;
     }
     st = get_module_state(mod);
@@ -2047,6 +2048,9 @@ delta_to_microseconds(PyDateTime_Delta *self)
 
     PyObject *current_mod = NULL;
     datetime_state *st = GET_CURRENT_STATE(current_mod);
+    if (current_mod == NULL) {
+        return NULL;
+    }
 
     x1 = PyLong_FromLong(GET_TD_DAYS(self));
     if (x1 == NULL)
@@ -2126,6 +2130,9 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
 
     PyObject *current_mod = NULL;
     datetime_state *st = GET_CURRENT_STATE(current_mod);
+    if (current_mod == NULL) {
+        return NULL;
+    }
 
     tuple = checked_divmod(pyus, CONST_US_PER_SECOND(st));
     if (tuple == NULL) {
@@ -2711,6 +2718,9 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 
     PyObject *current_mod = NULL;
     datetime_state *st = GET_CURRENT_STATE(current_mod);
+    if (current_mod == NULL) {
+        return NULL;
+    }
 
     /* Argument objects. */
     PyObject *day = NULL;
@@ -2930,6 +2940,9 @@ delta_total_seconds(PyObject *op, PyObject *Py_UNUSED(dummy))
 
     PyObject *current_mod = NULL;
     datetime_state *st = GET_CURRENT_STATE(current_mod);
+    if (current_mod == NULL) {
+        return NULL;
+    }
 
     total_seconds = PyNumber_TrueDivide(total_microseconds, CONST_US_PER_SECOND(st));
 
@@ -3713,6 +3726,9 @@ date_isocalendar(PyObject *self, PyObject *Py_UNUSED(dummy))
 
     PyObject *current_mod = NULL;
     datetime_state *st = GET_CURRENT_STATE(current_mod);
+    if (current_mod == NULL) {
+        return NULL;
+    }
 
     PyObject *v = iso_calendar_date_new_impl(ISOCALENDAR_DATE_TYPE(st),
                                              year, week + 1, day + 1);
@@ -6538,6 +6554,9 @@ local_timezone(PyDateTime_DateTime *utc_time)
 
     PyObject *current_mod = NULL;
     datetime_state *st = GET_CURRENT_STATE(current_mod);
+    if (current_mod == NULL) {
+        return NULL;
+    }
 
     delta = datetime_subtract((PyObject *)utc_time, CONST_EPOCH(st));
     RELEASE_CURRENT_STATE(st, current_mod);
@@ -6782,6 +6801,9 @@ datetime_timestamp(PyObject *op, PyObject *Py_UNUSED(dummy))
     if (HASTZINFO(self) && self->tzinfo != Py_None) {
         PyObject *current_mod = NULL;
         datetime_state *st = GET_CURRENT_STATE(current_mod);
+        if (current_mod == NULL) {
+            return NULL;
+        }
 
         PyObject *delta;
         delta = datetime_subtract(op, CONST_EPOCH(st));