Fix tests on free-threading build.

Author: serhiy-storchaka

Lib/test/test_ast/test_ast.py

@@ -1126,7 +1126,7 @@ def test_tstring(self):
         self.assertIsInstance(tree.body[0].value.values[1], ast.Interpolation)
 
     def test_filter_syntax_warnings_by_module(self):
-        filename = support.findfile('test_warnings/data/syntax_warnings.py')
+        filename = support.findfile('test_import/data/syntax_warnings.py')
         with open(filename, 'rb') as f:
             source = f.read()
         with warnings.catch_warnings(record=True) as wlog:

Lib/test/test_builtin.py

@@ -1089,7 +1089,7 @@ def four_freevars():
             closure=my_closure)
 
     def test_exec_filter_syntax_warnings_by_module(self):
-        filename = support.findfile('test_warnings/data/syntax_warnings.py')
+        filename = support.findfile('test_import/data/syntax_warnings.py')
         with open(filename, 'rb') as f:
             source = f.read()
         with warnings.catch_warnings(record=True) as wlog:

Lib/test/test_cmd_line_script.py

@@ -811,8 +811,8 @@ def test_script_as_dev_fd(self):
                 self.assertEqual(out, b"12345678912345678912345\n")
 
     def test_filter_syntax_warnings_by_module(self):
-        filename = support.findfile('test_warnings/data/syntax_warnings.py')
-        rc, out, err = assert_python_ok('-Werror', '-Walways:::test.test_warnings.data.syntax_warnings', filename)
+        filename = support.findfile('test_import/data/syntax_warnings.py')
+        rc, out, err = assert_python_ok('-Werror', '-Walways:::test.test_import.data.syntax_warnings', filename)
         self.assertEqual(err.count(b': SyntaxWarning: '), 6)
         rc, out, err = assert_python_ok('-Werror', '-Walways:::syntax_warnings', filename)
         self.assertEqual(err.count(b': SyntaxWarning: '), 6)

Lib/test/test_compile.py

@@ -6,7 +6,6 @@
 import opcode
 import os
 import unittest
-import re
 import sys
 import ast
 import _ast
@@ -1747,10 +1746,10 @@ def test_compile_warning_in_finally(self):
             self.assertIn("\"is\" with 'int' literal", str(wm.message))
 
     def test_filter_syntax_warnings_by_module(self):
-        filename = support.findfile('test_warnings/data/syntax_warnings.py')
+        filename = support.findfile('test_import/data/syntax_warnings.py')
         with open(filename, 'rb') as f:
             source = f.read()
-        module_re = r'test\.test_warnings\.data\.syntax_warnings\z'
+        module_re = r'test\.test_import\.data\.syntax_warnings\z'
         with warnings.catch_warnings(record=True) as wlog:
             warnings.simplefilter('error')
             warnings.filterwarnings('always', module=module_re)

Lib/test/test_import/__init__.py

@@ -45,7 +45,6 @@
     Py_GIL_DISABLED,
     no_rerun,
     force_not_colorized_test_class,
-    findfile
 )
 from test.support.import_helper import (
     forget, make_legacy_pyc, unlink, unload, ready_to_import,
@@ -1253,38 +1252,30 @@ class Spec2:
             _imp.create_dynamic(Spec2())
 
     def test_filter_syntax_warnings_by_module(self):
-        filename = findfile('test_warnings/data/syntax_warnings.py')
-        print()
-        print(filename)
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore')
-            import test.test_warnings.data.syntax_warnings
-        filename = test.test_warnings.data.syntax_warnings.__file__
-        print(filename)
-        module_re = r'test\.test_warnings\.data\.syntax_warnings\z'
-        unload('test.test_warnings.data.syntax_warnings')
+        module_re = r'test\.test_import\.data\.syntax_warnings\z'
+        unload('test.test_import.data.syntax_warnings')
         with (os_helper.temp_dir() as tmpdir,
               temporary_pycache_prefix(tmpdir),
               warnings.catch_warnings(record=True) as wlog):
             warnings.simplefilter('error')
             warnings.filterwarnings('always', module=module_re)
-            import test.test_warnings.data.syntax_warnings
+            import test.test_import.data.syntax_warnings
         self.assertEqual(sorted(wm.lineno for wm in wlog), [4, 7, 10, 13, 14, 21])
-        filename = test.test_warnings.data.syntax_warnings.__file__
+        filename = test.test_import.data.syntax_warnings.__file__
         for wm in wlog:
             self.assertEqual(wm.filename, filename)
             self.assertIs(wm.category, SyntaxWarning)
 
         module_re = r'syntax_warnings\z'
-        unload('test.test_warnings.data.syntax_warnings')
+        unload('test.test_import.data.syntax_warnings')
         with (os_helper.temp_dir() as tmpdir,
               temporary_pycache_prefix(tmpdir),
               warnings.catch_warnings(record=True) as wlog):
             warnings.simplefilter('error')
             warnings.filterwarnings('always', module=module_re)
-            import test.test_warnings.data.syntax_warnings
+            import test.test_import.data.syntax_warnings
         self.assertEqual(sorted(wm.lineno for wm in wlog), [4, 7, 10, 13, 14, 21])
-        filename = test.test_warnings.data.syntax_warnings.__file__
+        filename = test.test_import.data.syntax_warnings.__file__
         for wm in wlog:
             self.assertEqual(wm.filename, filename)
             self.assertIs(wm.category, SyntaxWarning)

Lib/test/test_warnings/data/syntax_warnings.py renamed to Lib/test/test_import/data/syntax_warnings.py

@@ -588,10 +588,10 @@ def test__symtable_refleak(self):
         self.assertRaises(TypeError, symtable.symtable, '', mortal_str, 1)
 
     def test_filter_syntax_warnings_by_module(self):
-        filename = support.findfile('test_warnings/data/syntax_warnings.py')
+        filename = support.findfile('test_import/data/syntax_warnings.py')
         with open(filename, 'rb') as f:
             source = f.read()
-        module_re = r'test\.test_warnings\.data\.syntax_warnings\z'
+        module_re = r'test\.test_import\.data\.syntax_warnings\z'
         with warnings.catch_warnings(record=True) as wlog:
             warnings.simplefilter('error')
             warnings.filterwarnings('always', module=module_re)

Lib/test/test_symtable.py

@@ -1457,14 +1457,6 @@ PyErr_WarnExplicitObject(PyObject *category, PyObject *message,
     if (tstate == NULL) {
         return -1;
     }
-    if (filename)
-        PySys_FormatStdout("filename = %R\n", filename);
-    else
-        PySys_FormatStdout("filename = NULL\n");
-    if (module)
-        PySys_FormatStdout("module = %R\n", module);
-    else
-        PySys_FormatStdout("module = NULL\n");
 
     warnings_lock(tstate->interp);
     res = warn_explicit(tstate, category, message, filename, lineno,