Apply changes from importlib_resources 5.0.4

Author: jaraco

Lib/test/test_importlib/test_reader.py

@@ -1,5 +1,6 @@
 import os.path
 import sys
+import pathlib
 import unittest
 
 from importlib import import_module
@@ -9,7 +10,8 @@
 class MultiplexedPathTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.folder = os.path.abspath(os.path.join(__file__, '..', 'namespacedata01'))
+        path = pathlib.Path(__file__).parent / 'namespacedata01'
+        cls.folder = str(path)
 
     def test_init_no_paths(self):
         with self.assertRaises(FileNotFoundError):
@@ -83,9 +85,15 @@ def test_repr(self):
 
 
 class NamespaceReaderTest(unittest.TestCase):
+    site_dir = str(pathlib.Path(__file__).parent)
+
     @classmethod
     def setUpClass(cls):
-        sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
+        sys.path.append(cls.site_dir)
+
+    @classmethod
+    def tearDownClass(cls):
+        sys.path.remove(cls.site_dir)
 
     def test_init_error(self):
         with self.assertRaises(ValueError):

Lib/test/test_importlib/test_resource.py

@@ -1,4 +1,3 @@
-import os.path
 import sys
 import unittest
 import uuid
@@ -216,9 +215,15 @@ def test_read_text_does_not_keep_open(self):
 
 
 class ResourceFromNamespaceTest01(unittest.TestCase):
+    site_dir = str(pathlib.Path(__file__).parent)
+
     @classmethod
     def setUpClass(cls):
-        sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
+        sys.path.append(cls.site_dir)
+
+    @classmethod
+    def tearDownClass(cls):
+        sys.path.remove(cls.site_dir)
 
     def test_is_submodule_resource(self):
         self.assertTrue(