summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_importlib/resources/data01/__init__.py (renamed from Lib/test/test_importlib/data01/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data01/binary.file (renamed from Lib/test/test_importlib/data01/binary.file)bin4 -> 4 bytes
-rw-r--r--Lib/test/test_importlib/resources/data01/subdirectory/__init__.py (renamed from Lib/test/test_importlib/data01/subdirectory/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data01/subdirectory/binary.file (renamed from Lib/test/test_importlib/data01/subdirectory/binary.file)bin4 -> 4 bytes
-rw-r--r--Lib/test/test_importlib/resources/data01/utf-16.file (renamed from Lib/test/test_importlib/data01/utf-16.file)bin44 -> 44 bytes
-rw-r--r--Lib/test/test_importlib/resources/data01/utf-8.file (renamed from Lib/test/test_importlib/data01/utf-8.file)0
-rw-r--r--Lib/test/test_importlib/resources/data02/__init__.py (renamed from Lib/test/test_importlib/data02/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data02/one/__init__.py (renamed from Lib/test/test_importlib/data02/one/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data02/one/resource1.txt (renamed from Lib/test/test_importlib/data02/one/resource1.txt)0
-rw-r--r--Lib/test/test_importlib/resources/data02/two/__init__.py (renamed from Lib/test/test_importlib/data02/two/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data02/two/resource2.txt (renamed from Lib/test/test_importlib/data02/two/resource2.txt)0
-rw-r--r--Lib/test/test_importlib/resources/data03/__init__.py (renamed from Lib/test/test_importlib/data03/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data03/namespace/portion1/__init__.py (renamed from Lib/test/test_importlib/data03/namespace/portion1/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data03/namespace/portion2/__init__.py (renamed from Lib/test/test_importlib/data03/namespace/portion2/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/data03/namespace/resource1.txt (renamed from Lib/test/test_importlib/data03/namespace/resource1.txt)0
-rw-r--r--Lib/test/test_importlib/resources/namespacedata01/binary.file (renamed from Lib/test/test_importlib/namespacedata01/binary.file)bin4 -> 4 bytes
-rw-r--r--Lib/test/test_importlib/resources/namespacedata01/utf-16.file (renamed from Lib/test/test_importlib/namespacedata01/utf-16.file)bin44 -> 44 bytes
-rw-r--r--Lib/test/test_importlib/resources/namespacedata01/utf-8.file (renamed from Lib/test/test_importlib/namespacedata01/utf-8.file)0
-rw-r--r--Lib/test/test_importlib/resources/test_compatibilty_files.py (renamed from Lib/test/test_importlib/test_compatibilty_files.py)2
-rw-r--r--Lib/test/test_importlib/resources/test_contents.py (renamed from Lib/test/test_importlib/test_contents.py)2
-rw-r--r--Lib/test/test_importlib/resources/test_files.py (renamed from Lib/test/test_importlib/test_files.py)2
-rw-r--r--Lib/test/test_importlib/resources/test_open.py (renamed from Lib/test/test_importlib/test_open.py)2
-rw-r--r--Lib/test/test_importlib/resources/test_path.py (renamed from Lib/test/test_importlib/test_path.py)2
-rw-r--r--Lib/test/test_importlib/resources/test_read.py (renamed from Lib/test/test_importlib/test_read.py)2
-rw-r--r--Lib/test/test_importlib/resources/test_reader.py (renamed from Lib/test/test_importlib/test_reader.py)0
-rw-r--r--Lib/test/test_importlib/resources/test_resource.py (renamed from Lib/test/test_importlib/test_resource.py)2
-rwxr-xr-xLib/test/test_importlib/resources/update-zips.py (renamed from Lib/test/test_importlib/update-zips.py)0
-rw-r--r--Lib/test/test_importlib/resources/util.py4
-rw-r--r--Lib/test/test_importlib/resources/zipdata01/__init__.py (renamed from Lib/test/test_importlib/zipdata01/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip (renamed from Lib/test/test_importlib/zipdata01/ziptestdata.zip)bin876 -> 876 bytes
-rw-r--r--Lib/test/test_importlib/resources/zipdata02/__init__.py (renamed from Lib/test/test_importlib/zipdata02/__init__.py)0
-rw-r--r--Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip (renamed from Lib/test/test_importlib/zipdata02/ziptestdata.zip)bin698 -> 698 bytes
32 files changed, 9 insertions, 9 deletions
diff --git a/Lib/test/test_importlib/data01/__init__.py b/Lib/test/test_importlib/resources/data01/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data01/__init__.py
+++ b/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
index eaf36c1dac..eaf36c1dac 100644
--- a/Lib/test/test_importlib/data01/binary.file
+++ b/Lib/test/test_importlib/resources/data01/binary.file
Binary files differ
diff --git a/Lib/test/test_importlib/data01/subdirectory/__init__.py b/Lib/test/test_importlib/resources/data01/subdirectory/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data01/subdirectory/__init__.py
+++ b/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
index eaf36c1dac..eaf36c1dac 100644
--- a/Lib/test/test_importlib/data01/subdirectory/binary.file
+++ b/Lib/test/test_importlib/resources/data01/subdirectory/binary.file
Binary files differ
diff --git a/Lib/test/test_importlib/data01/utf-16.file b/Lib/test/test_importlib/resources/data01/utf-16.file
index 2cb772295e..2cb772295e 100644
--- a/Lib/test/test_importlib/data01/utf-16.file
+++ b/Lib/test/test_importlib/resources/data01/utf-16.file
Binary files differ
diff --git a/Lib/test/test_importlib/data01/utf-8.file b/Lib/test/test_importlib/resources/data01/utf-8.file
index 1c0132ad90..1c0132ad90 100644
--- a/Lib/test/test_importlib/data01/utf-8.file
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data02/__init__.py
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data02/one/__init__.py
+++ b/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
index 61a813e401..61a813e401 100644
--- a/Lib/test/test_importlib/data02/one/resource1.txt
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data02/two/__init__.py
+++ b/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
index a80ce46ea3..a80ce46ea3 100644
--- a/Lib/test/test_importlib/data02/two/resource2.txt
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data03/__init__.py
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data03/namespace/portion1/__init__.py
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data03/namespace/portion2/__init__.py
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/data03/namespace/resource1.txt
+++ b/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
index eaf36c1dac..eaf36c1dac 100644
--- a/Lib/test/test_importlib/namespacedata01/binary.file
+++ b/Lib/test/test_importlib/resources/namespacedata01/binary.file
Binary files differ
diff --git a/Lib/test/test_importlib/namespacedata01/utf-16.file b/Lib/test/test_importlib/resources/namespacedata01/utf-16.file
index 2cb772295e..2cb772295e 100644
--- a/Lib/test/test_importlib/namespacedata01/utf-16.file
+++ b/Lib/test/test_importlib/resources/namespacedata01/utf-16.file
Binary files differ
diff --git a/Lib/test/test_importlib/namespacedata01/utf-8.file b/Lib/test/test_importlib/resources/namespacedata01/utf-8.file
index 1c0132ad90..1c0132ad90 100644
--- a/Lib/test/test_importlib/namespacedata01/utf-8.file
+++ b/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
index 9a823f2d93..6fa18a2497 100644
--- 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
index 3323bf5b5c..1a13f043a8 100644
--- 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
index b9170d83be..4665ed7cc0 100644
--- 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
index df75e343d2..0554c41ba6 100644
--- 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
index 6fc41f301d..adcf75feea 100644
--- 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
index ebd7226777..0ca8ee9d02 100644
--- 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
index 9d20c976b8..9d20c976b8 100644
--- a/Lib/test/test_importlib/test_reader.py
+++ b/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
index 834b8bd8a2..1d6df0cc84 100644
--- 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
index 231334aa7e..231334aa7e 100755
--- a/Lib/test/test_importlib/update-zips.py
+++ b/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 11c8aa8080..f80c9cd01d 100644
--- 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
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/zipdata01/__init__.py
+++ b/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
index 9a3bb0739f..9a3bb0739f 100644
--- a/Lib/test/test_importlib/zipdata01/ziptestdata.zip
+++ b/Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip
Binary files differ
diff --git a/Lib/test/test_importlib/zipdata02/__init__.py b/Lib/test/test_importlib/resources/zipdata02/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/Lib/test/test_importlib/zipdata02/__init__.py
+++ b/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
index d63ff512d2..d63ff512d2 100644
--- a/Lib/test/test_importlib/zipdata02/ziptestdata.zip
+++ b/Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip
Binary files differ