Smaller patch for tests

Author: neonene

Lib/test/datetimetester.py

@@ -7270,8 +7270,7 @@ def test_update_type_cache(self):
                 assert isinstance(_datetime.timezone.utc, _datetime.tzinfo)
                 del sys.modules['_datetime']
             """)
-        res = script_helper.assert_python_ok('-c', script)
-        self.assertFalse(res.err)
+        script_helper.assert_python_ok('-c', script)
 
     def test_module_free(self):
         script = textwrap.dedent("""

Lib/test/test_embed.py

@@ -461,7 +461,7 @@ def test_datetime_capi_at_shutdown(self):
             import sys
             import _testcapi
             _testcapi.test_datetime_capi()  # PyDateTime_IMPORT only once
-            timedelta = _testcapi.get_capi_types()['timedelta']
+            timedelta = type(_testcapi.get_delta_fromdsu(False, 1, 0, 0))
 
             def gen():
                 try:

Modules/_testcapi/datetime.c

@@ -453,37 +453,6 @@ test_PyDateTime_DELTA_GET(PyObject *self, PyObject *obj)
     return Py_BuildValue("(iii)", days, seconds, microseconds);
 }
 
-static PyObject *
-get_capi_types(PyObject *self, PyObject *args)
-{
-    if (PyDateTimeAPI == NULL) {
-        Py_RETURN_NONE;
-    }
-    PyObject *dict = PyDict_New();
-    if (dict == NULL) {
-        return NULL;
-    }
-    if (PyDict_SetItemString(dict, "date", (PyObject *)PyDateTimeAPI->DateType) < 0) {
-        goto error;
-    }
-    if (PyDict_SetItemString(dict, "time", (PyObject *)PyDateTimeAPI->TimeType) < 0) {
-        goto error;
-    }
-    if (PyDict_SetItemString(dict, "datetime", (PyObject *)PyDateTimeAPI->DateTimeType) < 0) {
-        goto error;
-    }
-    if (PyDict_SetItemString(dict, "timedelta", (PyObject *)PyDateTimeAPI->DeltaType) < 0) {
-        goto error;
-    }
-    if (PyDict_SetItemString(dict, "tzinfo", (PyObject *)PyDateTimeAPI->TZInfoType) < 0) {
-        goto error;
-    }
-    return dict;
-error:
-    Py_DECREF(dict);
-    return NULL;
-}
-
 static PyMethodDef test_methods[] = {
     {"PyDateTime_DATE_GET",         test_PyDateTime_DATE_GET,       METH_O},
     {"PyDateTime_DELTA_GET",        test_PyDateTime_DELTA_GET,      METH_O},
@@ -504,7 +473,6 @@ static PyMethodDef test_methods[] = {
     {"get_time_fromtimeandfold",    get_time_fromtimeandfold,       METH_VARARGS},
     {"get_timezone_utc_capi",       get_timezone_utc_capi,          METH_VARARGS},
     {"get_timezones_offset_zero",   get_timezones_offset_zero,      METH_NOARGS},
-    {"get_capi_types",              get_capi_types,                 METH_NOARGS},
     {"make_timezones_capi",         make_timezones_capi,            METH_NOARGS},
     {"test_datetime_capi",          test_datetime_capi,             METH_NOARGS},
     {NULL},