gh-95218: Move tests for importlib.resources into test_importlib.resources. (#95219)

* gh-95218: Move tests for importlib.resources into test_importlib.resources.

* Also update makefile

* Include test_importlib/resources in code ownership rule.

diff --git a/.gitattributes b/.gitattributes
index fb11ddb6dfae18e6462c18eca79b53e024b4ef06..79f7b712aa459e76f8b007a25a511d2dc4156c90 100644 (file)
--- 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

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 013e1cbd7241d5d9e69e80bf0ff993ee646af344..df79aa6503e0cf43e438f77270731eeeb84c96bd 100644 (file)
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -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 b/Lib/test/test_importlib/resources/data01/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data01/__init__.py
rename to Lib/test/test_importlib/resources/data01/__init__.py

diff --git a/Lib/test/test_importlib/data01/binary.file b/Lib/test/test_importlib/resources/data01/binary.file
similarity index 100%
rename from Lib/test/test_importlib/data01/binary.file
rename to Lib/test/test_importlib/resources/data01/binary.file

diff --git a/Lib/test/test_importlib/data01/subdirectory/__init__.py b/Lib/test/test_importlib/resources/data01/subdirectory/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data01/subdirectory/__init__.py
rename to Lib/test/test_importlib/resources/data01/subdirectory/__init__.py

diff --git a/Lib/test/test_importlib/data01/subdirectory/binary.file b/Lib/test/test_importlib/resources/data01/subdirectory/binary.file
similarity index 100%
rename from Lib/test/test_importlib/data01/subdirectory/binary.file
rename to Lib/test/test_importlib/resources/data01/subdirectory/binary.file

diff --git a/Lib/test/test_importlib/data01/utf-16.file b/Lib/test/test_importlib/resources/data01/utf-16.file
similarity index 100%
rename from Lib/test/test_importlib/data01/utf-16.file
rename to Lib/test/test_importlib/resources/data01/utf-16.file

diff --git a/Lib/test/test_importlib/data01/utf-8.file b/Lib/test/test_importlib/resources/data01/utf-8.file
similarity index 100%
rename from Lib/test/test_importlib/data01/utf-8.file
rename to Lib/test/test_importlib/resources/data01/utf-8.file

diff --git a/Lib/test/test_importlib/data02/__init__.py b/Lib/test/test_importlib/resources/data02/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data02/__init__.py
rename to Lib/test/test_importlib/resources/data02/__init__.py

diff --git a/Lib/test/test_importlib/data02/one/__init__.py b/Lib/test/test_importlib/resources/data02/one/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data02/one/__init__.py
rename to Lib/test/test_importlib/resources/data02/one/__init__.py

diff --git a/Lib/test/test_importlib/data02/one/resource1.txt b/Lib/test/test_importlib/resources/data02/one/resource1.txt
similarity index 100%
rename from Lib/test/test_importlib/data02/one/resource1.txt
rename to Lib/test/test_importlib/resources/data02/one/resource1.txt

diff --git a/Lib/test/test_importlib/data02/two/__init__.py b/Lib/test/test_importlib/resources/data02/two/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data02/two/__init__.py
rename to Lib/test/test_importlib/resources/data02/two/__init__.py

diff --git a/Lib/test/test_importlib/data02/two/resource2.txt b/Lib/test/test_importlib/resources/data02/two/resource2.txt
similarity index 100%
rename from Lib/test/test_importlib/data02/two/resource2.txt
rename to Lib/test/test_importlib/resources/data02/two/resource2.txt

diff --git a/Lib/test/test_importlib/data03/__init__.py b/Lib/test/test_importlib/resources/data03/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data03/__init__.py
rename to Lib/test/test_importlib/resources/data03/__init__.py

diff --git a/Lib/test/test_importlib/data03/namespace/portion1/__init__.py b/Lib/test/test_importlib/resources/data03/namespace/portion1/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data03/namespace/portion1/__init__.py
rename to Lib/test/test_importlib/resources/data03/namespace/portion1/__init__.py

diff --git a/Lib/test/test_importlib/data03/namespace/portion2/__init__.py b/Lib/test/test_importlib/resources/data03/namespace/portion2/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data03/namespace/portion2/__init__.py
rename to Lib/test/test_importlib/resources/data03/namespace/portion2/__init__.py

diff --git a/Lib/test/test_importlib/data03/namespace/resource1.txt b/Lib/test/test_importlib/resources/data03/namespace/resource1.txt
similarity index 100%
rename from Lib/test/test_importlib/data03/namespace/resource1.txt
rename to Lib/test/test_importlib/resources/data03/namespace/resource1.txt

diff --git a/Lib/test/test_importlib/namespacedata01/binary.file b/Lib/test/test_importlib/resources/namespacedata01/binary.file
similarity index 100%
rename from Lib/test/test_importlib/namespacedata01/binary.file
rename to Lib/test/test_importlib/resources/namespacedata01/binary.file

diff --git a/Lib/test/test_importlib/namespacedata01/utf-16.file b/Lib/test/test_importlib/resources/namespacedata01/utf-16.file
similarity index 100%
rename from Lib/test/test_importlib/namespacedata01/utf-16.file
rename to Lib/test/test_importlib/resources/namespacedata01/utf-16.file

diff --git a/Lib/test/test_importlib/namespacedata01/utf-8.file b/Lib/test/test_importlib/resources/namespacedata01/utf-8.file
similarity index 100%
rename from Lib/test/test_importlib/namespacedata01/utf-8.file
rename to Lib/test/test_importlib/resources/namespacedata01/utf-8.file

diff --git a/Lib/test/test_importlib/test_compatibilty_files.py b/Lib/test/test_importlib/resources/test_compatibilty_files.py
similarity index 99%
rename from Lib/test/test_importlib/test_compatibilty_files.py
rename to Lib/test/test_importlib/resources/test_compatibilty_files.py
index 9a823f2d9305837c2ac9c440bb4e901b6d845480..6fa18a24973f6444370de77159212ec91fdd003a 100644 (file)
--- a/Lib/test/test_importlib/test_compatibilty_files.py
+++ b/Lib/test/test_importlib/resources/test_compatibilty_files.py
@@ -8,7 +8,7 @@ from importlib.resources._adapters import (
     wrap_spec,
 )
 
-from .resources import util
+from . import util
 
 
 class CompatibilityFilesTests(unittest.TestCase):

diff --git a/Lib/test/test_importlib/test_contents.py b/Lib/test/test_importlib/resources/test_contents.py
similarity index 97%
rename from Lib/test/test_importlib/test_contents.py
rename to Lib/test/test_importlib/resources/test_contents.py
index 3323bf5b5cf5688ec78496a88c0e430efcfca1ff..1a13f043a86f034d709810289d9d524f734fbf33 100644 (file)
--- a/Lib/test/test_importlib/test_contents.py
+++ b/Lib/test/test_importlib/resources/test_contents.py
@@ -2,7 +2,7 @@ import unittest
 from importlib import resources
 
 from . import data01
-from .resources import util
+from . import util
 
 
 class ContentsTests:

diff --git a/Lib/test/test_importlib/test_files.py b/Lib/test/test_importlib/resources/test_files.py
similarity index 97%
rename from Lib/test/test_importlib/test_files.py
rename to Lib/test/test_importlib/resources/test_files.py
index b9170d83bea912ae76e0ede26098fa01fd0e61b1..4665ed7cc00dcfa5c8b549e1236f27233555b267 100644 (file)
--- a/Lib/test/test_importlib/test_files.py
+++ b/Lib/test/test_importlib/resources/test_files.py
@@ -4,7 +4,7 @@ import unittest
 from importlib import resources
 from importlib.abc import Traversable
 from . import data01
-from .resources import util
+from . import util
 
 
 class FilesTests:

diff --git a/Lib/test/test_importlib/test_open.py b/Lib/test/test_importlib/resources/test_open.py
similarity index 98%
rename from Lib/test/test_importlib/test_open.py
rename to Lib/test/test_importlib/resources/test_open.py
index df75e343d2c5b7770bb3709fa447dbdd2d62ad86..0554c41ba67d0ef723beda0dcf252953d1d1994a 100644 (file)
--- a/Lib/test/test_importlib/test_open.py
+++ b/Lib/test/test_importlib/resources/test_open.py
@@ -2,7 +2,7 @@ import unittest
 
 from importlib import resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):

diff --git a/Lib/test/test_importlib/test_path.py b/Lib/test/test_importlib/resources/test_path.py
similarity index 98%
rename from Lib/test/test_importlib/test_path.py
rename to Lib/test/test_importlib/resources/test_path.py
index 6fc41f301d1cab196a26bacb7b8bd1a1535a62c3..adcf75feea78ec000037f5289e330e79c1756c79 100644 (file)
--- a/Lib/test/test_importlib/test_path.py
+++ b/Lib/test/test_importlib/resources/test_path.py
@@ -3,7 +3,7 @@ import unittest
 
 from importlib import resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonTests(util.CommonTests, unittest.TestCase):

diff --git a/Lib/test/test_importlib/test_read.py b/Lib/test/test_importlib/resources/test_read.py
similarity index 98%
rename from Lib/test/test_importlib/test_read.py
rename to Lib/test/test_importlib/resources/test_read.py
index ebd72267776d969bd72a816e7d5cc21713406935..0ca8ee9d02856b6a796292812039e415733f9a05 100644 (file)
--- a/Lib/test/test_importlib/test_read.py
+++ b/Lib/test/test_importlib/resources/test_read.py
@@ -2,7 +2,7 @@ import unittest
 
 from importlib import import_module, resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):

diff --git a/Lib/test/test_importlib/test_reader.py b/Lib/test/test_importlib/resources/test_reader.py
similarity index 100%
rename from Lib/test/test_importlib/test_reader.py
rename to Lib/test/test_importlib/resources/test_reader.py

diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/resources/test_resource.py
similarity index 99%
rename from Lib/test/test_importlib/test_resource.py
rename to Lib/test/test_importlib/resources/test_resource.py
index 834b8bd8a28189718cdadf459ce784fb62f3035e..1d6df0cc8431730fc453ceff5f7b34549591a176 100644 (file)
--- a/Lib/test/test_importlib/test_resource.py
+++ b/Lib/test/test_importlib/resources/test_resource.py
@@ -5,7 +5,7 @@ import pathlib
 
 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

diff --git a/Lib/test/test_importlib/update-zips.py b/Lib/test/test_importlib/resources/update-zips.py
similarity index 100%
rename from Lib/test/test_importlib/update-zips.py
rename to Lib/test/test_importlib/resources/update-zips.py

diff --git a/Lib/test/test_importlib/resources/util.py b/Lib/test/test_importlib/resources/util.py
index 11c8aa80806dceb4e0cd15b5c35ab9b4f217120d..f80c9cd01d66ebb4b27a40f8521069cc11dab4e6 100644 (file)
--- a/Lib/test/test_importlib/resources/util.py
+++ b/Lib/test/test_importlib/resources/util.py
@@ -5,8 +5,8 @@ import sys
 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/Lib/test/test_importlib/zipdata01/__init__.py b/Lib/test/test_importlib/resources/zipdata01/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/zipdata01/__init__.py
rename to Lib/test/test_importlib/resources/zipdata01/__init__.py

diff --git a/Lib/test/test_importlib/zipdata01/ziptestdata.zip b/Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip
similarity index 100%
rename from Lib/test/test_importlib/zipdata01/ziptestdata.zip
rename to Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip

diff --git a/Lib/test/test_importlib/zipdata02/__init__.py b/Lib/test/test_importlib/resources/zipdata02/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/zipdata02/__init__.py
rename to Lib/test/test_importlib/resources/zipdata02/__init__.py

diff --git a/Lib/test/test_importlib/zipdata02/ziptestdata.zip b/Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip
similarity index 100%
rename from Lib/test/test_importlib/zipdata02/ziptestdata.zip
rename to Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip

diff --git a/Makefile.pre.in b/Makefile.pre.in
index dd0216572e601929e717f05670f23c8db6ce44f6..ab44f2158e92d278d47d69d9fb2e2ebafe6839f6 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..7326689
--- /dev/null
+++ 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.