Oops, there's no test.support.os_helper on 3.9

Author: ambv

Lib/test/test_genericpath.py

@@ -8,9 +8,8 @@
 import unittest
 import warnings
 from test import support
-from test.support import os_helper
 from test.support.script_helper import assert_python_ok
-from test.support import FakePath
+from test.support import FakePath, EnvironmentVarGuard
 
 
 def create_file(filename, data=b'foo'):
@@ -375,7 +374,7 @@ def test_splitdrive(self):
 
     def test_expandvars(self):
         expandvars = self.pathmodule.expandvars
-        with support.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             env["foo"] = "bar"
             env["{foo"] = "baz1"
@@ -409,7 +408,7 @@ def test_expandvars_nonascii(self):
         expandvars = self.pathmodule.expandvars
         def check(value, expected):
             self.assertEqual(expandvars(value), expected)
-        with support.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             nonascii = support.FS_NONASCII
             env['spam'] = nonascii
@@ -433,7 +432,7 @@ def check(value, expected):
     @support.requires_resource('cpu')
     def test_expandvars_large(self):
         expandvars = self.pathmodule.expandvars
-        with os_helper.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             env["A"] = "B"
             n = 100_000

Lib/test/test_ntpath.py

@@ -4,7 +4,7 @@
 import unittest
 import warnings
 from ntpath import ALLOW_MISSING
-from test.support import TestFailed, FakePath, os_helper
+from test.support import TestFailed, FakePath, EnvironmentVarGuard
 from test import support, test_genericpath
 from tempfile import TemporaryFile
 
@@ -641,7 +641,7 @@ def test_realpath_cwd(self):
                         ntpath.realpath("file.txt", **kwargs))
 
     def test_expandvars(self):
-        with support.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             env["foo"] = "bar"
             env["{foo"] = "baz1"
@@ -670,7 +670,7 @@ def test_expandvars(self):
     def test_expandvars_nonascii(self):
         def check(value, expected):
             tester('ntpath.expandvars(%r)' % value, expected)
-        with support.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             nonascii = support.FS_NONASCII
             env['spam'] = nonascii
@@ -689,7 +689,7 @@ def check(value, expected):
     @support.requires_resource('cpu')
     def test_expandvars_large(self):
         expandvars = ntpath.expandvars
-        with os_helper.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             env["A"] = "B"
             n = 100_000
@@ -702,7 +702,7 @@ def test_expandvars_large(self):
     def test_expanduser(self):
         tester('ntpath.expanduser("test")', 'test')
 
-        with support.EnvironmentVarGuard() as env:
+        with EnvironmentVarGuard() as env:
             env.clear()
             tester('ntpath.expanduser("~test")', '~test')