Cleanup

Author: neonene

Lib/test/datetimetester.py

@@ -7155,8 +7155,8 @@ def test_datetime_from_timestamp(self):
 
                     self.assertEqual(dt_orig, dt_rt)
 
-    def assert_python_in_subinterp(self, check_if_ok, script, init='',
-                                   fini='', repeat=1, config='isolated'):
+    def assert_python_ok_in_subinterp(self, script, init='', fini='',
+                                      repeat=1, config='isolated'):
         # iOS requires the use of the custom framework loader,
         # not the ExtensionFileLoader.
         if sys.platform == "ios":
@@ -7177,7 +7177,7 @@ def assert_python_in_subinterp(self, check_if_ok, script, init='',
                 spec = importlib.util.spec_from_loader(fullname, loader)
                 _testcapi = importlib.util.module_from_spec(spec)
                 spec.loader.exec_module(_testcapi)
-            INDEX = $INDEX$
+            run_counter = $RUN_COUNTER$
             setup = _testcapi.test_datetime_capi_newinterp  # call it if needed
             $SCRIPT$
             """
@@ -7187,8 +7187,8 @@ def assert_python_in_subinterp(self, check_if_ok, script, init='',
             setup = _testcapi.test_datetime_capi_newinterp
             $INIT$
 
-            for idx in range({repeat}):
-                subcode = subinterp_code.replace('$INDEX$', str(idx))
+            for i in range(1, {1 + repeat}):
+                subcode = subinterp_code.replace('$RUN_COUNTER$', str(i))
                 if {_interpreters is None}:
                     ret = support.run_in_subinterp(subcode)
                 else:
@@ -7200,12 +7200,7 @@ def assert_python_in_subinterp(self, check_if_ok, script, init='',
         ''')
         code = code.replace('$INIT$', init).replace('$FINI$', fini)
         code = code.replace('$SCRIPT$', script)
-
-        if check_if_ok:
-            res = script_helper.assert_python_ok('-c', code)
-        else:
-            res = script_helper.assert_python_failure('-c', code)
-        return res
+        return script_helper.assert_python_ok('-c', code)
 
     def test_type_check_in_subinterp(self):
         script = textwrap.dedent(f"""
@@ -7221,10 +7216,10 @@ def run(type_checker, obj):
             run(_testcapi.datetime_check_delta,    _datetime.timedelta(1))
             run(_testcapi.datetime_check_tzinfo,   _datetime.tzinfo())
             """)
-        self.assert_python_in_subinterp(True, script)
+        self.assert_python_ok_in_subinterp(script)
         if _interpreters is not None:
             with self.subTest(name := 'legacy'):
-                self.assert_python_in_subinterp(True, script, config=name)
+                self.assert_python_ok_in_subinterp(script, config=name)
 
 
 class ExtensionModuleTests(unittest.TestCase):
@@ -7233,8 +7228,8 @@ def setUp(self):
         if self.__class__.__name__.endswith('Pure'):
             self.skipTest('Not relevant in pure Python')
 
-    def assert_python_in_subinterp(self, *args, **kwargs):
-        return CapiTest.assert_python_in_subinterp(self, *args, **kwargs)
+    def assert_python_ok_in_subinterp(self, *args, **kwargs):
+        return CapiTest.assert_python_ok_in_subinterp(self, *args, **kwargs)
 
     @support.cpython_only
     def test_gh_120161(self):
@@ -7337,25 +7332,25 @@ def test_static_type_on_subinterp(self):
             """)
         with_setup = 'setup()' + script
         with self.subTest('[PyDateTime_IMPORT] main: no, sub: yes'):
-            self.assert_python_in_subinterp(True, with_setup)
+            self.assert_python_ok_in_subinterp(with_setup)
 
         with self.subTest('[PyDateTime_IMPORT] main: yes, sub: yes'):
             # Fails if the setup() means test_datetime_capi() rather than
             # test_datetime_capi_newinterp()
-            self.assert_python_in_subinterp(True, with_setup, 'setup()')
-            self.assert_python_in_subinterp(True, 'setup()', fini=with_setup)
-            self.assert_python_in_subinterp(True, with_setup, repeat=2)
+            self.assert_python_ok_in_subinterp(with_setup, 'setup()')
+            self.assert_python_ok_in_subinterp('setup()', fini=with_setup)
+            self.assert_python_ok_in_subinterp(with_setup, repeat=2)
 
         with_import = 'import _datetime' + script
         with self.subTest('Explicit import'):
-            self.assert_python_in_subinterp(True, with_import, 'setup()')
+            self.assert_python_ok_in_subinterp(with_import, 'setup()')
 
         with_import = textwrap.dedent("""
             timedelta = _testcapi.get_capi_types()['timedelta']
             timedelta(days=1)
             """) + script
         with self.subTest('Implicit import'):
-            self.assert_python_in_subinterp(True, with_import, 'setup()')
+            self.assert_python_ok_in_subinterp(with_import, 'setup()')
 
     def test_static_type_at_shutdown(self):
         # gh-132413
@@ -7383,7 +7378,7 @@ def gen():
             res = script_helper.assert_python_ok('-c', script)
             self.assertFalse(res.err)
         with self.subTest('Subinterpreter'):
-            res = self.assert_python_in_subinterp(True, script)
+            res = self.assert_python_ok_in_subinterp(script)
             self.assertFalse(res.err)
 
         script = textwrap.dedent("""
@@ -7404,12 +7399,12 @@ def gen():
             next(it)
             """)
         with self.subTest('[PyDateTime_IMPORT] main: yes, sub: no'):
-            res = self.assert_python_in_subinterp(True, script, 'setup()')
+            res = self.assert_python_ok_in_subinterp(script, 'setup()')
             self.assertIn(b'ImportError: sys.meta_path is None', res.err)
 
         with_import = 'setup()' + script
         with self.subTest('[PyDateTime_IMPORT] main: no, sub: yes'):
-            res = self.assert_python_in_subinterp(True, with_import)
+            res = self.assert_python_ok_in_subinterp(with_import)
             self.assertFalse(res.err)
 
 

Lib/test/test_embed.py

@@ -458,7 +458,7 @@ def gen():
                     try:
                         timedelta(days=1)
                         res = 1
-                    except ImportError as e:
+                    except ImportError:
                         res = 2
                     print(res)
 

Modules/_datetimemodule.c

@@ -12,7 +12,6 @@
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_GetOne()
 #include "pycore_object.h"        // _PyObject_Init()
-#include "pycore_pylifecycle.h"   // _Py_IsInterpreterFinalizing()
 #include "pycore_time.h"          // _PyTime_ObjectToTime_t()
 #include "pycore_unicodeobject.h" // _PyUnicode_Copy()
 
@@ -156,7 +155,6 @@ _get_current_state(PyObject **p_mod)
      * so we must re-import the module. */
     PyObject *mod = PyImport_ImportModule("_datetime");
     if (mod == NULL) {
-        assert(_Py_IsInterpreterFinalizing(interp));
         return NULL;
     }
     st = get_module_state(mod);