python · idomic · Feb 11, 2020 · Feb 11, 2020 · Feb 12, 2020 · Feb 13, 2020
diff --git a/Lib/ctypes/test/__main__.py b/Lib/ctypes/test/__main__.py
diff --git a/Lib/ctypes/test/__init__.py → Lib/test/ctypes_test/__init__.py b/Lib/ctypes/test/__init__.py → Lib/test/ctypes_test/__init__.py
diff --git a/Lib/test/ctypes_test/__main__.py b/Lib/test/ctypes_test/__main__.py
@@ -0,0 +1,4 @@
+from Lib.test.ctypes_test import load_tests
+import unittest
+
+unittest.main()
diff --git a/Lib/ctypes/test/test_anon.py → Lib/test/ctypes_test/test_anon.py b/Lib/ctypes/test/test_anon.py → Lib/test/ctypes_test/test_anon.py
diff --git a/Lib/ctypes/test/test_array_in_pointer.py → ...test/ctypes_test/test_array_in_pointer.py b/Lib/ctypes/test/test_array_in_pointer.py → ...test/ctypes_test/test_array_in_pointer.py
diff --git a/Lib/ctypes/test/test_arrays.py → Lib/test/ctypes_test/test_arrays.py b/Lib/ctypes/test/test_arrays.py → Lib/test/ctypes_test/test_arrays.py
@@ -3,7 +3,7 @@
 import sys
 from ctypes import *
 
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 formats = "bBhHiIlLqQfd"
 

diff --git a/Lib/ctypes/test/test_as_parameter.py → Lib/test/ctypes_test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py → Lib/test/ctypes_test/test_as_parameter.py
@@ -1,6 +1,6 @@
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import _ctypes_test
 
 dll = CDLL(_ctypes_test.__file__)

diff --git a/Lib/ctypes/test/test_bitfields.py → Lib/test/ctypes_test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py → Lib/test/ctypes_test/test_bitfields.py
@@ -1,5 +1,5 @@
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import unittest
 import os
 

diff --git a/Lib/ctypes/test/test_buffers.py → Lib/test/ctypes_test/test_buffers.py b/Lib/ctypes/test/test_buffers.py → Lib/test/ctypes_test/test_buffers.py
@@ -1,5 +1,5 @@
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import unittest
 
 class StringBufferTestCase(unittest.TestCase):

diff --git a/Lib/ctypes/test/test_bytes.py → Lib/test/ctypes_test/test_bytes.py b/Lib/ctypes/test/test_bytes.py → Lib/test/ctypes_test/test_bytes.py
diff --git a/Lib/ctypes/test/test_byteswap.py → Lib/test/ctypes_test/test_byteswap.py b/Lib/ctypes/test/test_byteswap.py → Lib/test/ctypes_test/test_byteswap.py
diff --git a/Lib/ctypes/test/test_callbacks.py → Lib/test/ctypes_test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py → Lib/test/ctypes_test/test_callbacks.py
@@ -1,7 +1,7 @@
 import functools
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import _ctypes_test
 
 class Callbacks(unittest.TestCase):

diff --git a/Lib/ctypes/test/test_cast.py → Lib/test/ctypes_test/test_cast.py b/Lib/ctypes/test/test_cast.py → Lib/test/ctypes_test/test_cast.py
@@ -1,5 +1,5 @@
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import unittest
 import sys
 

diff --git a/Lib/ctypes/test/test_cfuncs.py → Lib/test/ctypes_test/test_cfuncs.py b/Lib/ctypes/test/test_cfuncs.py → Lib/test/ctypes_test/test_cfuncs.py
@@ -3,7 +3,7 @@
 
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 import _ctypes_test
 

diff --git a/Lib/ctypes/test/test_checkretval.py → Lib/test/ctypes_test/test_checkretval.py b/Lib/ctypes/test/test_checkretval.py → Lib/test/ctypes_test/test_checkretval.py
@@ -1,7 +1,7 @@
 import unittest
 
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 class CHECKED(c_int):
     def _check_retval_(value):

diff --git a/Lib/ctypes/test/test_delattr.py → Lib/test/ctypes_test/test_delattr.py b/Lib/ctypes/test/test_delattr.py → Lib/test/ctypes_test/test_delattr.py
diff --git a/Lib/ctypes/test/test_errno.py → Lib/test/ctypes_test/test_errno.py b/Lib/ctypes/test/test_errno.py → Lib/test/ctypes_test/test_errno.py
diff --git a/Lib/ctypes/test/test_find.py → Lib/test/ctypes_test/test_find.py b/Lib/ctypes/test/test_find.py → Lib/test/ctypes_test/test_find.py
diff --git a/Lib/ctypes/test/test_frombuffer.py → Lib/test/ctypes_test/test_frombuffer.py b/Lib/ctypes/test/test_frombuffer.py → Lib/test/ctypes_test/test_frombuffer.py
diff --git a/Lib/ctypes/test/test_funcptr.py → Lib/test/ctypes_test/test_funcptr.py b/Lib/ctypes/test/test_funcptr.py → Lib/test/ctypes_test/test_funcptr.py
diff --git a/Lib/ctypes/test/test_functions.py → Lib/test/ctypes_test/test_functions.py b/Lib/ctypes/test/test_functions.py → Lib/test/ctypes_test/test_functions.py
@@ -6,7 +6,7 @@
 """
 
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import sys, unittest
 
 try:

diff --git a/Lib/ctypes/test/test_incomplete.py → Lib/test/ctypes_test/test_incomplete.py b/Lib/ctypes/test/test_incomplete.py → Lib/test/ctypes_test/test_incomplete.py
diff --git a/Lib/ctypes/test/test_init.py → Lib/test/ctypes_test/test_init.py b/Lib/ctypes/test/test_init.py → Lib/test/ctypes_test/test_init.py
diff --git a/Lib/ctypes/test/test_internals.py → Lib/test/ctypes_test/test_internals.py b/Lib/ctypes/test/test_internals.py → Lib/test/ctypes_test/test_internals.py
diff --git a/Lib/ctypes/test/test_keeprefs.py → Lib/test/ctypes_test/test_keeprefs.py b/Lib/ctypes/test/test_keeprefs.py → Lib/test/ctypes_test/test_keeprefs.py
diff --git a/Lib/ctypes/test/test_libc.py → Lib/test/ctypes_test/test_libc.py b/Lib/ctypes/test/test_libc.py → Lib/test/ctypes_test/test_libc.py
diff --git a/Lib/ctypes/test/test_loading.py → Lib/test/ctypes_test/test_loading.py b/Lib/ctypes/test/test_loading.py → Lib/test/ctypes_test/test_loading.py
diff --git a/Lib/ctypes/test/test_macholib.py → Lib/test/ctypes_test/test_macholib.py b/Lib/ctypes/test/test_macholib.py → Lib/test/ctypes_test/test_macholib.py
diff --git a/Lib/ctypes/test/test_memfunctions.py → Lib/test/ctypes_test/test_memfunctions.py b/Lib/ctypes/test/test_memfunctions.py → Lib/test/ctypes_test/test_memfunctions.py
@@ -2,7 +2,7 @@
 from test import support
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 class MemFunctionsTest(unittest.TestCase):
     @unittest.skip('test disabled')

diff --git a/Lib/ctypes/test/test_numbers.py → Lib/test/ctypes_test/test_numbers.py b/Lib/ctypes/test/test_numbers.py → Lib/test/ctypes_test/test_numbers.py
diff --git a/Lib/ctypes/test/test_objects.py → Lib/test/ctypes_test/test_objects.py b/Lib/ctypes/test/test_objects.py → Lib/test/ctypes_test/test_objects.py
@@ -42,7 +42,7 @@
 of 'x' ('_b_base_' is either None, or the root object owning the memory block):
 
 >>> print(x.array._b_base_) # doctest: +ELLIPSIS
-<ctypes.test.test_objects.X object at 0x...>
+<Lib.test.ctypes_test.test_objects.X object at 0x...>
 >>>
 
 >>> x.array[0] = b'spam spam spam'
@@ -55,13 +55,12 @@
 '''
 
 import unittest, doctest
-
-import ctypes.test.test_objects
+import Lib.test.ctypes_test.test_objects as test_objects
 
 class TestCase(unittest.TestCase):
     def test(self):
-        failures, tests = doctest.testmod(ctypes.test.test_objects)
+        failures, tests = doctest.testmod(test_objects)
         self.assertFalse(failures, 'doctests failed, see output above')
 
 if __name__ == '__main__':
-    doctest.testmod(ctypes.test.test_objects)
+    doctest.testmod(test_objects)
diff --git a/Lib/ctypes/test/test_parameters.py → Lib/test/ctypes_test/test_parameters.py b/Lib/ctypes/test/test_parameters.py → Lib/test/ctypes_test/test_parameters.py
@@ -1,5 +1,5 @@
 import unittest
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import test.support
 
 class SimpleTypesTestCase(unittest.TestCase):

diff --git a/Lib/ctypes/test/test_pep3118.py → Lib/test/ctypes_test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py → Lib/test/ctypes_test/test_pep3118.py
diff --git a/Lib/ctypes/test/test_pickling.py → Lib/test/ctypes_test/test_pickling.py b/Lib/ctypes/test/test_pickling.py → Lib/test/ctypes_test/test_pickling.py
diff --git a/Lib/ctypes/test/test_pointers.py → Lib/test/ctypes_test/test_pointers.py b/Lib/ctypes/test/test_pointers.py → Lib/test/ctypes_test/test_pointers.py
diff --git a/Lib/ctypes/test/test_prototypes.py → Lib/test/ctypes_test/test_prototypes.py b/Lib/ctypes/test/test_prototypes.py → Lib/test/ctypes_test/test_prototypes.py
@@ -1,5 +1,5 @@
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 import unittest
 
 # IMPORTANT INFO:

diff --git a/Lib/ctypes/test/test_python_api.py → Lib/test/ctypes_test/test_python_api.py b/Lib/ctypes/test/test_python_api.py → Lib/test/ctypes_test/test_python_api.py
diff --git a/Lib/ctypes/test/test_random_things.py → Lib/test/ctypes_test/test_random_things.py b/Lib/ctypes/test/test_random_things.py → Lib/test/ctypes_test/test_random_things.py
diff --git a/Lib/ctypes/test/test_refcounts.py → Lib/test/ctypes_test/test_refcounts.py b/Lib/ctypes/test/test_refcounts.py → Lib/test/ctypes_test/test_refcounts.py
diff --git a/Lib/ctypes/test/test_repr.py → Lib/test/ctypes_test/test_repr.py b/Lib/ctypes/test/test_repr.py → Lib/test/ctypes_test/test_repr.py
diff --git a/Lib/ctypes/test/test_returnfuncptrs.py → Lib/test/ctypes_test/test_returnfuncptrs.py b/Lib/ctypes/test/test_returnfuncptrs.py → Lib/test/ctypes_test/test_returnfuncptrs.py
diff --git a/Lib/ctypes/test/test_simplesubclasses.py → ...test/ctypes_test/test_simplesubclasses.py b/Lib/ctypes/test/test_simplesubclasses.py → ...test/ctypes_test/test_simplesubclasses.py
diff --git a/Lib/ctypes/test/test_sizes.py → Lib/test/ctypes_test/test_sizes.py b/Lib/ctypes/test/test_sizes.py → Lib/test/ctypes_test/test_sizes.py
diff --git a/Lib/ctypes/test/test_slicing.py → Lib/test/ctypes_test/test_slicing.py b/Lib/ctypes/test/test_slicing.py → Lib/test/ctypes_test/test_slicing.py
@@ -1,6 +1,6 @@
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 import _ctypes_test
 

diff --git a/Lib/ctypes/test/test_stringptr.py → Lib/test/ctypes_test/test_stringptr.py b/Lib/ctypes/test/test_stringptr.py → Lib/test/ctypes_test/test_stringptr.py
diff --git a/Lib/ctypes/test/test_strings.py → Lib/test/ctypes_test/test_strings.py b/Lib/ctypes/test/test_strings.py → Lib/test/ctypes_test/test_strings.py
@@ -1,6 +1,6 @@
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 class StringArrayTestCase(unittest.TestCase):
     def test(self):

diff --git a/Lib/ctypes/test/test_struct_fields.py → Lib/test/ctypes_test/test_struct_fields.py b/Lib/ctypes/test/test_struct_fields.py → Lib/test/ctypes_test/test_struct_fields.py
diff --git a/Lib/ctypes/test/test_structures.py → Lib/test/ctypes_test/test_structures.py b/Lib/ctypes/test/test_structures.py → Lib/test/ctypes_test/test_structures.py
@@ -2,7 +2,7 @@
 import sys
 import unittest
 from ctypes import *
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 from struct import calcsize
 import _ctypes_test
 from test import support

diff --git a/Lib/ctypes/test/test_unaligned_structures.py → .../ctypes_test/test_unaligned_structures.py b/Lib/ctypes/test/test_unaligned_structures.py → .../ctypes_test/test_unaligned_structures.py
diff --git a/Lib/ctypes/test/test_unicode.py → Lib/test/ctypes_test/test_unicode.py b/Lib/ctypes/test/test_unicode.py → Lib/test/ctypes_test/test_unicode.py
@@ -1,6 +1,6 @@
 import unittest
 import ctypes
-from ctypes.test import need_symbol
+from Lib.test.ctypes_test import need_symbol
 
 import _ctypes_test
 

diff --git a/Lib/ctypes/test/test_values.py → Lib/test/ctypes_test/test_values.py b/Lib/ctypes/test/test_values.py → Lib/test/ctypes_test/test_values.py
diff --git a/Lib/ctypes/test/test_varsize_struct.py → Lib/test/ctypes_test/test_varsize_struct.py b/Lib/ctypes/test/test_varsize_struct.py → Lib/test/ctypes_test/test_varsize_struct.py
diff --git a/Lib/ctypes/test/test_win32.py → Lib/test/ctypes_test/test_win32.py b/Lib/ctypes/test/test_win32.py → Lib/test/ctypes_test/test_win32.py
diff --git a/Lib/ctypes/test/test_wintypes.py → Lib/test/ctypes_test/test_wintypes.py b/Lib/ctypes/test/test_wintypes.py → Lib/test/ctypes_test/test_wintypes.py
diff --git a/Lib/distutils/tests/Setup.sample → Lib/test/distutils_tests/Setup.sample b/Lib/distutils/tests/Setup.sample → Lib/test/distutils_tests/Setup.sample
diff --git a/Lib/distutils/tests/__init__.py → Lib/test/distutils_tests/__init__.py b/Lib/distutils/tests/__init__.py → Lib/test/distutils_tests/__init__.py
@@ -1,12 +1,12 @@
 """Test suite for distutils.
 
 This test suite consists of a collection of test modules in the
-distutils.tests package.  Each test module has a name starting with
+Lib.test.distutils_tests package.  Each test module has a name starting with
 'test' and contains a function test_suite().  The function is expected
 to return an initialized unittest.TestSuite instance.
 
 Tests for the command classes in the distutils.command package are
-included in distutils.tests as well, instead of using a separate
+included in Lib.test.distutils_tests as well, instead of using a separate
 distutils.command.tests package, since command identification is done
 by import rather than matching pre-defined names.
 
@@ -25,7 +25,7 @@ def test_suite():
     suite = unittest.TestSuite()
     for fn in os.listdir(here):
         if fn.startswith("test") and fn.endswith(".py"):
-            modname = "distutils.tests." + fn[:-3]
+            modname = "Lib.test.distutils_tests." + fn[:-3]
             __import__(modname)
             module = sys.modules[modname]
             suite.addTest(module.test_suite())

diff --git a/Lib/distutils/tests/includetest.rst → Lib/test/distutils_tests/includetest.rst b/Lib/distutils/tests/includetest.rst → Lib/test/distutils_tests/includetest.rst
diff --git a/Lib/distutils/tests/support.py → Lib/test/distutils_tests/support.py b/Lib/distutils/tests/support.py → Lib/test/distutils_tests/support.py
diff --git a/Lib/distutils/tests/test_archive_util.py → ...test/distutils_tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py → ...test/distutils_tests/test_archive_util.py
@@ -12,7 +12,7 @@
                                     make_zipfile, make_archive,
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import check_warnings, run_unittest, patch, change_cwd
 
 try:

diff --git a/Lib/distutils/tests/test_bdist.py → Lib/test/distutils_tests/test_bdist.py b/Lib/distutils/tests/test_bdist.py → Lib/test/distutils_tests/test_bdist.py
@@ -5,7 +5,7 @@
 import warnings
 
 from distutils.command.bdist import bdist
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 
 
 class BuildTestCase(support.TempdirManager,

diff --git a/Lib/distutils/tests/test_bdist_dumb.py → Lib/test/distutils_tests/test_bdist_dumb.py b/Lib/distutils/tests/test_bdist_dumb.py → Lib/test/distutils_tests/test_bdist_dumb.py
@@ -8,7 +8,7 @@
 
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 
 SETUP_PY = """\
 from distutils.core import setup

diff --git a/Lib/distutils/tests/test_bdist_msi.py → Lib/test/distutils_tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py → Lib/test/distutils_tests/test_bdist_msi.py
@@ -2,7 +2,7 @@
 import sys
 import unittest
 from test.support import run_unittest, check_warnings
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 
 
 @unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows')

diff --git a/Lib/distutils/tests/test_bdist_rpm.py → Lib/test/distutils_tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py → Lib/test/distutils_tests/test_bdist_rpm.py
@@ -7,7 +7,7 @@
 
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils.spawn import find_executable
 
 SETUP_PY = """\

diff --git a/Lib/distutils/tests/test_bdist_wininst.py → ...est/distutils_tests/test_bdist_wininst.py b/Lib/distutils/tests/test_bdist_wininst.py → ...est/distutils_tests/test_bdist_wininst.py
@@ -5,7 +5,7 @@
 from test.support import run_unittest, check_warnings
 
 from distutils.command.bdist_wininst import bdist_wininst
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 
 @unittest.skipIf(sys.platform == 'win32' and platform.machine() == 'ARM64',
     'bdist_wininst is not supported in this install')

diff --git a/Lib/distutils/tests/test_build.py → Lib/test/distutils_tests/test_build.py b/Lib/distutils/tests/test_build.py → Lib/test/distutils_tests/test_build.py
@@ -5,7 +5,7 @@
 from test.support import run_unittest
 
 from distutils.command.build import build
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from sysconfig import get_platform
 
 class BuildTestCase(support.TempdirManager,

diff --git a/Lib/distutils/tests/test_build_clib.py → Lib/test/distutils_tests/test_build_clib.py b/Lib/distutils/tests/test_build_clib.py → Lib/test/distutils_tests/test_build_clib.py
@@ -7,7 +7,7 @@
 
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils.spawn import find_executable
 
 class BuildCLibTestCase(support.TempdirManager,

diff --git a/Lib/distutils/tests/test_build_ext.py → Lib/test/distutils_tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py → Lib/test/distutils_tests/test_build_ext.py
@@ -6,7 +6,7 @@
 from distutils.core import Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
-from distutils.tests.support import (TempdirManager, LoggingSilencer,
+from Lib.test.distutils_tests.support import (TempdirManager, LoggingSilencer,
                                      copy_xxmodule_c, fixup_build_ext)
 from distutils.extension import Extension
 from distutils.errors import (

diff --git a/Lib/distutils/tests/test_build_py.py → Lib/test/distutils_tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py → Lib/test/distutils_tests/test_build_py.py
@@ -8,7 +8,7 @@
 from distutils.core import Distribution
 from distutils.errors import DistutilsFileError
 
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import run_unittest
 
 

diff --git a/Lib/distutils/tests/test_build_scripts.py → ...est/distutils_tests/test_build_scripts.py b/Lib/distutils/tests/test_build_scripts.py → ...est/distutils_tests/test_build_scripts.py
@@ -7,7 +7,7 @@
 from distutils.core import Distribution
 from distutils import sysconfig
 
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import run_unittest
 
 

diff --git a/Lib/distutils/tests/test_check.py → Lib/test/distutils_tests/test_check.py b/Lib/distutils/tests/test_check.py → Lib/test/distutils_tests/test_check.py
@@ -5,7 +5,7 @@
 from test.support import run_unittest
 
 from distutils.command.check import check, HAS_DOCUTILS
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils.errors import DistutilsSetupError
 
 try:

diff --git a/Lib/distutils/tests/test_clean.py → Lib/test/distutils_tests/test_clean.py b/Lib/distutils/tests/test_clean.py → Lib/test/distutils_tests/test_clean.py
@@ -3,7 +3,7 @@
 import unittest
 
 from distutils.command.clean import clean
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import run_unittest
 
 class cleanTestCase(support.TempdirManager,

diff --git a/Lib/distutils/tests/test_cmd.py → Lib/test/distutils_tests/test_cmd.py b/Lib/distutils/tests/test_cmd.py → Lib/test/distutils_tests/test_cmd.py
diff --git a/Lib/distutils/tests/test_config.py → Lib/test/distutils_tests/test_config.py b/Lib/distutils/tests/test_config.py → Lib/test/distutils_tests/test_config.py
@@ -7,7 +7,7 @@
 from distutils.log import set_threshold
 from distutils.log import WARN
 
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import run_unittest
 
 PYPIRC = """\

diff --git a/Lib/distutils/tests/test_config_cmd.py → Lib/test/distutils_tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py → Lib/test/distutils_tests/test_config_cmd.py
@@ -5,7 +5,7 @@
 from test.support import run_unittest, missing_compiler_executable
 
 from distutils.command.config import dump_file, config
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils import log
 
 class ConfigTestCase(support.LoggingSilencer,

diff --git a/Lib/distutils/tests/test_core.py → Lib/test/distutils_tests/test_core.py b/Lib/distutils/tests/test_core.py → Lib/test/distutils_tests/test_core.py
@@ -8,7 +8,7 @@
 import test.support
 from test.support import captured_stdout, run_unittest
 import unittest
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils import log
 
 # setup script that uses __file__

diff --git a/Lib/distutils/tests/test_cygwinccompiler.py → ...t/distutils_tests/test_cygwinccompiler.py b/Lib/distutils/tests/test_cygwinccompiler.py → ...t/distutils_tests/test_cygwinccompiler.py
@@ -10,7 +10,7 @@
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
                                        CONFIG_H_UNCERTAIN, get_versions,
                                        get_msvcr)
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 
 class FakePopen(object):
     test_class = None

diff --git a/Lib/distutils/tests/test_dep_util.py → Lib/test/distutils_tests/test_dep_util.py b/Lib/distutils/tests/test_dep_util.py → Lib/test/distutils_tests/test_dep_util.py
@@ -4,7 +4,7 @@
 
 from distutils.dep_util import newer, newer_pairwise, newer_group
 from distutils.errors import DistutilsFileError
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import run_unittest
 
 class DepUtilTestCase(support.TempdirManager, unittest.TestCase):

diff --git a/Lib/distutils/tests/test_dir_util.py → Lib/test/distutils_tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py → Lib/test/distutils_tests/test_dir_util.py
@@ -10,7 +10,7 @@
                                 ensure_relative)
 
 from distutils import log
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from test.support import run_unittest
 
 

diff --git a/Lib/distutils/tests/test_dist.py → Lib/test/distutils_tests/test_dist.py b/Lib/distutils/tests/test_dist.py → Lib/test/distutils_tests/test_dist.py
@@ -14,7 +14,7 @@
 from test.support import (
      TESTFN, captured_stdout, captured_stderr, run_unittest
 )
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils import log
 
 
@@ -69,16 +69,16 @@ def test_command_packages_unspecified(self):
         self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_command_packages_cmdline(self):
-        from distutils.tests.test_dist import test_dist
+        from Lib.test.distutils_tests.test_dist import test_dist
         sys.argv.extend(["--command-packages",
-                         "foo.bar,distutils.tests",
+                         "foo.bar,Lib.test.distutils_tests",
                          "test_dist",
                          "-Ssometext",
                          ])
         d = self.create_distribution()
         # let's actually try to load our test command:
         self.assertEqual(d.get_command_packages(),
-                         ["distutils.command", "foo.bar", "distutils.tests"])
+                         ["distutils.command", "foo.bar", "Lib.test.distutils_tests"])
         cmd = d.get_command_obj("test_dist")
         self.assertIsInstance(cmd, test_dist)
         self.assertEqual(cmd.sample_option, "sometext")

diff --git a/Lib/distutils/tests/test_extension.py → Lib/test/distutils_tests/test_extension.py b/Lib/distutils/tests/test_extension.py → Lib/test/distutils_tests/test_extension.py
diff --git a/Lib/distutils/tests/test_file_util.py → Lib/test/distutils_tests/test_file_util.py b/Lib/distutils/tests/test_file_util.py → Lib/test/distutils_tests/test_file_util.py
@@ -6,7 +6,7 @@
 
 from distutils.file_util import move_file, copy_file
 from distutils import log
-from distutils.tests import support
+from Lib.test.distutils_tests import support
 from distutils.errors import DistutilsFileError
 from test.support import run_unittest, unlink