Consolidate into init_state().

Author: ericsnowcurrently

Modules/_datetimemodule.c

@@ -6968,8 +6968,9 @@ create_timezone_from_delta(int days, int sec, int ms, int normalize)
 }
 
 static int
-init_heap_types(datetime_state *st, PyObject *module)
+init_state(datetime_state *st, PyObject *module, PyObject *old_module)
 {
+    /* Each module gets its own heap types. */
 #define ADD_TYPE(FIELD, SPEC, BASE)                 \
     do {                                            \
         PyObject *cls = PyType_FromModuleAndSpec(   \
@@ -6983,14 +6984,22 @@ init_heap_types(datetime_state *st, PyObject *module)
     ADD_TYPE(isocalendar_date_type, &isocal_spec, &PyTuple_Type);
 #undef ADD_TYPE
 
-    return 0;
-}
-
-static int
-init_state(datetime_state *st)
-{
-    /* st->isocalendar_date_type was set via init_heap_types(). */
-    assert(st->isocalendar_date_type != NULL);
+    if (old_module != NULL) {
+        assert(old_module != module);
+        datetime_state *st_old = get_module_state(old_module);
+        *st = (datetime_state){
+            .isocalendar_date_type = st->isocalendar_date_type,
+            .us_per_ms = Py_NewRef(st_old->us_per_ms),
+            .us_per_second = Py_NewRef(st_old->us_per_second),
+            .us_per_minute = Py_NewRef(st_old->us_per_minute),
+            .us_per_hour = Py_NewRef(st_old->us_per_hour),
+            .us_per_day = Py_NewRef(st_old->us_per_day),
+            .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),
+        };
+        return 0;
+    }
 
     st->us_per_ms = PyLong_FromLong(1000);
     if (st->us_per_ms == NULL) {
@@ -7035,28 +7044,6 @@ init_state(datetime_state *st)
     return 0;
 }
 
-static int
-copy_state(datetime_state *st, datetime_state *from)
-{
-    /* isocalendar_date_type is set via init_heap_types(). */
-    assert(st->isocalendar_date_type != NULL);
-    assert(st->isocalendar_date_type != from->isocalendar_date_type);
-
-    *st = (datetime_state){
-        .isocalendar_date_type = st->isocalendar_date_type,
-        .us_per_ms = Py_NewRef(from->us_per_ms),
-        .us_per_second = Py_NewRef(from->us_per_second),
-        .us_per_minute = Py_NewRef(from->us_per_minute),
-        .us_per_hour = Py_NewRef(from->us_per_hour),
-        .us_per_day = Py_NewRef(from->us_per_day),
-        .us_per_week = Py_NewRef(from->us_per_week),
-        .seconds_per_day = Py_NewRef(from->seconds_per_day),
-        .epoch = Py_NewRef(from->epoch),
-    };
-
-    return 0;
-}
-
 static int
 traverse_state(datetime_state *st, visitproc visit, void *arg)
 {
@@ -7117,22 +7104,10 @@ _datetime_exec(PyObject *module)
         }
     }
 
-    if (init_heap_types(st, module) < 0) {
+    if (init_state(st, module, old_module) < 0) {
         goto error;
     }
 
-    if (old_module != NULL) {
-        datetime_state *st_old = get_module_state(old_module);
-        if (copy_state(st, st_old) < 0) {
-            goto error;
-        }
-    }
-    else {
-        if (init_state(st) < 0) {
-            goto error;
-        }
-    }
-
     /* For now we only set the objects on the static types once.
      * We will relax that once each types __dict__ is per-interpreter. */
 #define DATETIME_ADD_MACRO(dict, c, value_expr)         \