bpo-40275: Use new test.support helper submodules in tests (GH-21451)
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 7a5df46..30c29a2 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -10,6 +10,7 @@
import sysconfig
import test.support
from test import support
+from test.support import os_helper
from test.support.script_helper import assert_python_ok, assert_python_failure
from test.support import threading_helper
import textwrap
@@ -632,7 +633,7 @@
out = p.communicate()[0].strip()
self.assertEqual(out, b'\xbd')
- @unittest.skipUnless(test.support.FS_NONASCII,
+ @unittest.skipUnless(os_helper.FS_NONASCII,
'requires OS support of non-ASCII encodings')
@unittest.skipUnless(sys.getfilesystemencoding() == locale.getpreferredencoding(False),
'requires FS encoding to match locale')
@@ -641,10 +642,10 @@
env["PYTHONIOENCODING"] = ""
p = subprocess.Popen([sys.executable, "-c",
- 'print(%a)' % test.support.FS_NONASCII],
+ 'print(%a)' % os_helper.FS_NONASCII],
stdout=subprocess.PIPE, env=env)
out = p.communicate()[0].strip()
- self.assertEqual(out, os.fsencode(test.support.FS_NONASCII))
+ self.assertEqual(out, os.fsencode(os_helper.FS_NONASCII))
@unittest.skipIf(sys.base_prefix != sys.prefix,
'Test is not venv-compatible')