bpo-44771: rename namespacedata01 to namespacedata

This should fix the buildbots, see
#27436 (comment)

Signed-off-by: Filipe Laíns <[email protected]>

Author: FFY00

Lib/test/test_importlib/namespacedata01/binary.file renamed to Lib/test/test_importlib/namespacedata/binary.file

@@ -37,6 +37,6 @@ class ContentsNamespaceTests(ContentsTests, unittest.TestCase):
     }
 
     def setUp(self):
-        from . import namespacedata01
+        from . import namespacedata
 
-        self.data = namespacedata01
+        self.data = namespacedata

Lib/test/test_importlib/namespacedata01/utf-16.file renamed to Lib/test/test_importlib/namespacedata/utf-16.file

@@ -37,9 +37,9 @@ class OpenZipTests(FilesTests, util.ZipSetup, unittest.TestCase):
 
 class OpenNamespaceTests(FilesTests, unittest.TestCase):
     def setUp(self):
-        from . import namespacedata01
+        from . import namespacedata
 
-        self.data = namespacedata01
+        self.data = namespacedata
 
 
 if __name__ == '__main__':

Lib/test/test_importlib/namespacedata01/utf-8.file renamed to Lib/test/test_importlib/namespacedata/utf-8.file

@@ -64,9 +64,9 @@ def setUp(self):
 
 class OpenDiskNamespaceTests(OpenTests, unittest.TestCase):
     def setUp(self):
-        from . import namespacedata01
+        from . import namespacedata
 
-        self.data = namespacedata01
+        self.data = namespacedata
 
 
 class OpenZipTests(OpenTests, util.ZipSetup, unittest.TestCase):

Lib/test/test_importlib/test_contents.py

@@ -57,9 +57,9 @@ def test_read_submodule_resource_by_name(self):
 
 class ReadNamespaceTests(ReadTests, unittest.TestCase):
     def setUp(self):
-        from . import namespacedata01
+        from . import namespacedata
 
-        self.data = namespacedata01
+        self.data = namespacedata
 
 
 if __name__ == '__main__':

Lib/test/test_importlib/test_files.py

@@ -10,7 +10,7 @@
 class MultiplexedPathTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        path = pathlib.Path(__file__).parent / 'namespacedata01'
+        path = pathlib.Path(__file__).parent / 'namespacedata'
         cls.folder = str(path)
 
     def test_init_no_paths(self):
@@ -65,15 +65,15 @@ def test_join_path(self):
         path = MultiplexedPath(self.folder, data01)
         self.assertEqual(
             str(path.joinpath('binary.file'))[len(prefix) + 1 :],
-            os.path.join('namespacedata01', 'binary.file'),
+            os.path.join('namespacedata', 'binary.file'),
         )
         self.assertEqual(
             str(path.joinpath('subdirectory'))[len(prefix) + 1 :],
             os.path.join('data01', 'subdirectory'),
         )
         self.assertEqual(
             str(path.joinpath('imaginary'))[len(prefix) + 1 :],
-            os.path.join('namespacedata01', 'imaginary'),
+            os.path.join('namespacedata', 'imaginary'),
         )
 
     def test_repr(self):
@@ -105,10 +105,10 @@ def test_init_error(self):
             NamespaceReader(['path1', 'path2'])
 
     def test_resource_path(self):
-        namespacedata01 = import_module('namespacedata01')
-        reader = NamespaceReader(namespacedata01.__spec__.submodule_search_locations)
+        namespacedata = import_module('namespacedata01')
+        reader = NamespaceReader(namespacedata.__spec__.submodule_search_locations)
 
-        root = os.path.abspath(os.path.join(__file__, '..', 'namespacedata01'))
+        root = os.path.abspath(os.path.join(__file__, '..', 'namespacedata'))
         self.assertEqual(
             reader.resource_path('binary.file'), os.path.join(root, 'binary.file')
         )
@@ -117,9 +117,9 @@ def test_resource_path(self):
         )
 
     def test_files(self):
-        namespacedata01 = import_module('namespacedata01')
-        reader = NamespaceReader(namespacedata01.__spec__.submodule_search_locations)
-        root = os.path.abspath(os.path.join(__file__, '..', 'namespacedata01'))
+        namespacedata = import_module('namespacedata01')
+        reader = NamespaceReader(namespacedata.__spec__.submodule_search_locations)
+        root = os.path.abspath(os.path.join(__file__, '..', 'namespacedata'))
         self.assertIsInstance(reader.files(), MultiplexedPath)
         self.assertEqual(repr(reader.files()), f"MultiplexedPath('{root}')")
 

Lib/test/test_importlib/test_open.py

@@ -227,22 +227,22 @@ def tearDownClass(cls):
 
     def test_is_submodule_resource(self):
         self.assertTrue(
-            resources.is_resource(import_module('namespacedata01'), 'binary.file')
+            resources.is_resource(import_module('namespacedata'), 'binary.file')
         )
 
     def test_read_submodule_resource_by_name(self):
-        self.assertTrue(resources.is_resource('namespacedata01', 'binary.file'))
+        self.assertTrue(resources.is_resource('namespacedata', 'binary.file'))
 
     def test_submodule_contents(self):
-        contents = set(resources.contents(import_module('namespacedata01')))
+        contents = set(resources.contents(import_module('namespacedata')))
         try:
             contents.remove('__pycache__')
         except KeyError:
             pass
         self.assertEqual(contents, {'binary.file', 'utf-8.file', 'utf-16.file'})
 
     def test_submodule_contents_by_name(self):
-        contents = set(resources.contents('namespacedata01'))
+        contents = set(resources.contents('namespacedata'))
         try:
             contents.remove('__pycache__')
         except KeyError:

Lib/test/test_importlib/test_read.py

@@ -1514,7 +1514,7 @@ TESTSUBDIRS=	ctypes/test \
 		test/test_importlib/namespace_pkgs/project3 \
 		test/test_importlib/namespace_pkgs/project3/parent \
 		test/test_importlib/namespace_pkgs/project3/parent/child \
-		test/test_importlib/namespacedata01 \
+		test/test_importlib/namespacedata \
 		test/test_importlib/partial \
 		test/test_importlib/source \
 		test/test_importlib/zipdata01 \