Clean up the diff

Author: brandtbucher

Include/internal/pycore_optimizer.h

@@ -108,10 +108,10 @@ void _Py_ExecutorInit(_PyExecutorObject *, const _PyBloomFilter *);
 void _Py_ExecutorDetach(_PyExecutorObject *);
 void _Py_BloomFilter_Init(_PyBloomFilter *);
 void _Py_BloomFilter_Add(_PyBloomFilter *bloom, void *obj);
-
 PyAPI_FUNC(void) _Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj);
 
 // For testing
+// Export for '_testinternalcapi' shared extension.
 PyAPI_FUNC(_PyOptimizerObject *) _Py_GetOptimizer(void);
 PyAPI_FUNC(int) _Py_SetTier2Optimizer(_PyOptimizerObject* optimizer);
 PyAPI_FUNC(PyObject *) _PyOptimizer_NewUOpOptimizer(void);

Lib/test/test_capi/test_opt.py

@@ -57,7 +57,8 @@ def get_opnames(ex):
 
 @requires_specialization
 @unittest.skipIf(Py_GIL_DISABLED, "optimizer not yet supported in free-threaded builds")
-@unittest.skipUnless(hasattr(_testinternalcapi, "new_uop_optimizer"), "required infrastructure")
+@unittest.skipUnless(hasattr(_testinternalcapi, "get_optimizer"),
+                     "Requires optimizer infrastructure")
 class TestExecutorInvalidation(unittest.TestCase):
 
     def test_invalidate_object(self):

Lib/test/test_monitoring.py

@@ -12,10 +12,8 @@
 
 import test.support
 from test.support import requires_specialization_ft, script_helper
-from test.support.import_helper import import_module
 
 _testcapi = test.support.import_helper.import_module("_testcapi")
-_testinternalcapi = test.support.import_helper.import_module("_testinternalcapi")
 
 PAIR = (0,1)