python · jaraco · Jul 25, 2022 · Jul 24, 2022 · Jul 24, 2022 · Jul 24, 2022
diff --git a/.gitattributes b/.gitattributes
@@ -28,8 +28,8 @@ Lib/test/cjkencodings/*                    noeol
 Lib/test/coding20731.py                    noeol
 Lib/test/decimaltestdata/*.decTest         noeol
 Lib/test/test_email/data/*.txt             noeol
-Lib/test/test_importlib/data01/*           noeol
-Lib/test/test_importlib/namespacedata01/*  noeol
+Lib/test/test_importlib/resources/data01/*           noeol
+Lib/test/test_importlib/resources/namespacedata01/*  noeol
 Lib/test/xmltestdata/*                     noeol
 
 # CRLF files

@@ -61,7 +61,7 @@ Python/pythonrun.c            @iritkatriel
 # bytecode.
 **/*import*.c                 @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
 **/*import*.py                @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
-**/importlib/resources/*      @jaraco @warsaw @brettcannon
+**/*importlib/resources/*      @jaraco @warsaw @brettcannon
 **/importlib/metadata/*       @jaraco @warsaw
 
 # Dates and times

diff --git a/Lib/test/test_importlib/data01/__init__.py → ...st_importlib/resources/data01/__init__.py b/Lib/test/test_importlib/data01/__init__.py → ...st_importlib/resources/data01/__init__.py
diff --git a/Lib/test/test_importlib/data01/binary.file → ...st_importlib/resources/data01/binary.file b/Lib/test/test_importlib/data01/binary.file → ...st_importlib/resources/data01/binary.file
diff --git a/...importlib/data01/subdirectory/__init__.py → ...resources/data01/subdirectory/__init__.py b/...importlib/data01/subdirectory/__init__.py → ...resources/data01/subdirectory/__init__.py
diff --git a/...importlib/data01/subdirectory/binary.file → ...resources/data01/subdirectory/binary.file b/...importlib/data01/subdirectory/binary.file → ...resources/data01/subdirectory/binary.file
diff --git a/Lib/test/test_importlib/data01/utf-16.file → ...st_importlib/resources/data01/utf-16.file b/Lib/test/test_importlib/data01/utf-16.file → ...st_importlib/resources/data01/utf-16.file
diff --git a/Lib/test/test_importlib/data01/utf-8.file → ...est_importlib/resources/data01/utf-8.file b/Lib/test/test_importlib/data01/utf-8.file → ...est_importlib/resources/data01/utf-8.file
diff --git a/Lib/test/test_importlib/data02/__init__.py → ...st_importlib/resources/data02/__init__.py b/Lib/test/test_importlib/data02/__init__.py → ...st_importlib/resources/data02/__init__.py
diff --git a/...est/test_importlib/data02/one/__init__.py → ...mportlib/resources/data02/one/__init__.py b/...est/test_importlib/data02/one/__init__.py → ...mportlib/resources/data02/one/__init__.py
diff --git a/...t/test_importlib/data02/one/resource1.txt → ...ortlib/resources/data02/one/resource1.txt b/...t/test_importlib/data02/one/resource1.txt → ...ortlib/resources/data02/one/resource1.txt
diff --git a/...est/test_importlib/data02/two/__init__.py → ...mportlib/resources/data02/two/__init__.py b/...est/test_importlib/data02/two/__init__.py → ...mportlib/resources/data02/two/__init__.py
diff --git a/...t/test_importlib/data02/two/resource2.txt → ...ortlib/resources/data02/two/resource2.txt b/...t/test_importlib/data02/two/resource2.txt → ...ortlib/resources/data02/two/resource2.txt
diff --git a/Lib/test/test_importlib/data03/__init__.py → ...st_importlib/resources/data03/__init__.py b/Lib/test/test_importlib/data03/__init__.py → ...st_importlib/resources/data03/__init__.py
diff --git a/...lib/data03/namespace/portion1/__init__.py → ...ces/data03/namespace/portion1/__init__.py b/...lib/data03/namespace/portion1/__init__.py → ...ces/data03/namespace/portion1/__init__.py
diff --git a/...lib/data03/namespace/portion2/__init__.py → ...ces/data03/namespace/portion2/__init__.py b/...lib/data03/namespace/portion2/__init__.py → ...ces/data03/namespace/portion2/__init__.py
diff --git a/..._importlib/data03/namespace/resource1.txt → .../resources/data03/namespace/resource1.txt b/..._importlib/data03/namespace/resource1.txt → .../resources/data03/namespace/resource1.txt
diff --git a/...est_importlib/namespacedata01/binary.file → ...lib/resources/namespacedata01/binary.file b/...est_importlib/namespacedata01/binary.file → ...lib/resources/namespacedata01/binary.file
diff --git a/...est_importlib/namespacedata01/utf-16.file → ...lib/resources/namespacedata01/utf-16.file b/...est_importlib/namespacedata01/utf-16.file → ...lib/resources/namespacedata01/utf-16.file
diff --git a/...test_importlib/namespacedata01/utf-8.file → ...tlib/resources/namespacedata01/utf-8.file b/...test_importlib/namespacedata01/utf-8.file → ...tlib/resources/namespacedata01/utf-8.file
@@ -8,7 +8,7 @@
     wrap_spec,
 )
 
-from .resources import util
+from . import util
 
 
 class CompatibilityFilesTests(unittest.TestCase):

@@ -2,7 +2,7 @@
 from importlib import resources
 
 from . import data01
-from .resources import util
+from . import util
 
 
 class ContentsTests:

@@ -4,7 +4,7 @@
 from importlib import resources
 from importlib.abc import Traversable
 from . import data01
-from .resources import util
+from . import util
 
 
 class FilesTests:

@@ -2,7 +2,7 @@
 
 from importlib import resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):

@@ -3,7 +3,7 @@
 
 from importlib import resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonTests(util.CommonTests, unittest.TestCase):

@@ -2,7 +2,7 @@
 
 from importlib import import_module, resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):

@@ -5,7 +5,7 @@
 
 from . import data01
 from . import zipdata01, zipdata02
-from .resources import util
+from . import util
 from importlib import resources, import_module
 from test.support import import_helper
 from test.support.os_helper import unlink

@@ -5,8 +5,8 @@
 import types
 from pathlib import Path, PurePath
 
-from .. import data01
-from .. import zipdata01
+from . import data01
+from . import zipdata01
 from importlib.abc import ResourceReader
 from test.support import import_helper
 

diff --git a/...test/test_importlib/zipdata01/__init__.py → ...importlib/resources/zipdata01/__init__.py b/...test/test_importlib/zipdata01/__init__.py → ...importlib/resources/zipdata01/__init__.py
diff --git a/.../test_importlib/zipdata01/ziptestdata.zip → ...rtlib/resources/zipdata01/ziptestdata.zip b/.../test_importlib/zipdata01/ziptestdata.zip → ...rtlib/resources/zipdata01/ziptestdata.zip
diff --git a/...test/test_importlib/zipdata02/__init__.py → ...importlib/resources/zipdata02/__init__.py b/...test/test_importlib/zipdata02/__init__.py → ...importlib/resources/zipdata02/__init__.py
diff --git a/.../test_importlib/zipdata02/ziptestdata.zip → ...rtlib/resources/zipdata02/ziptestdata.zip b/.../test_importlib/zipdata02/ziptestdata.zip → ...rtlib/resources/zipdata02/ziptestdata.zip
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1926,15 +1926,6 @@ TESTSUBDIRS=	distutils/tests \
 		test/test_importlib \
 		test/test_importlib/builtin \
 		test/test_importlib/data \
-		test/test_importlib/data01 \
-		test/test_importlib/data01/subdirectory \
-		test/test_importlib/data02 \
-		test/test_importlib/data02/one \
-		test/test_importlib/data02/two \
-		test/test_importlib/data03 \
-		test/test_importlib/data03/namespace \
-		test/test_importlib/data03/namespace/portion1 \
-		test/test_importlib/data03/namespace/portion2 \
 		test/test_importlib/extension \
 		test/test_importlib/frozen \
 		test/test_importlib/import_ \
@@ -1958,12 +1949,21 @@ TESTSUBDIRS=	distutils/tests \
 		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/partial \
 		test/test_importlib/resources \
+		test/test_importlib/resources/data01 \
+		test/test_importlib/resources/data01/subdirectory \
+		test/test_importlib/resources/data02 \
+		test/test_importlib/resources/data02/one \
+		test/test_importlib/resources/data02/two \
+		test/test_importlib/resources/data03 \
+		test/test_importlib/resources/data03/namespace \
+		test/test_importlib/resources/data03/namespace/portion1 \
+		test/test_importlib/resources/data03/namespace/portion2 \
+		test/test_importlib/resources/namespacedata01 \
+		test/test_importlib/resources/zipdata01 \
+		test/test_importlib/resources/zipdata02 \
 		test/test_importlib/source \
-		test/test_importlib/zipdata01 \
-		test/test_importlib/zipdata02 \
 		test/test_json \
 		test/test_lib2to3 \
 		test/test_lib2to3/data \

diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-17-24-42.gh-issue-95218.zfBLtu.rst b/Misc/NEWS.d/next/Tests/2022-07-24-17-24-42.gh-issue-95218.zfBLtu.rst
@@ -0,0 +1 @@
+Move tests for importlib.resources into test_importlib.resources.