From 10d1b9bda5c67273a8dcc79fc85373af54fded44 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 19:12:58 -0400
Subject: [PATCH 1/7] Move test_threaded_import.py to dir test_importlib/

Component of issue 19696
---
 Lib/test/{ => test_importlib}/test_threaded_import.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Lib/test/{ => test_importlib}/test_threaded_import.py (100%)

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

From c9c738c9767af3086f74c3139f82480df0de0105 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 19:15:14 -0400
Subject: [PATCH 2/7] Move theaded_import_hangers.py to dir test_importlib/

Component of issue 19696
---
 Lib/test/{ => test_importlib}/threaded_import_hangers.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Lib/test/{ => test_importlib}/threaded_import_hangers.py (100%)

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

From bba2151d3c9027191b7fda526c89360ee424ebf0 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 20:21:21 -0400
Subject: [PATCH 3/7] Updated threaded_import_hangers import

The import statement needed to be updated to reflect the location change of ``threaded_import_hangers.py``
---
 Lib/test/test_importlib/test_threaded_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py
index 035344be4b89976..c6b6db6fa700e3f 100644
--- a/Lib/test/test_importlib/test_threaded_import.py
+++ b/Lib/test/test_importlib/test_threaded_import.py
@@ -181,7 +181,7 @@ def test_import_hangers(self):
             del sys.modules['test.threaded_import_hangers']
         except KeyError:
             pass
-        import test.threaded_import_hangers
+        import test.test_importlib.threaded_import_hangers
         self.assertFalse(test.threaded_import_hangers.errors)
 
     def test_circular_imports(self):

From eafbd37bcacee31e0c96154fd40637673973bcb5 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 20:26:00 -0400
Subject: [PATCH 4/7] Update other references to "threaded_import_hangers"

Updated the other references to ``threaded_import_hangers.py`` to reflect the change in location
---
 Lib/test/test_importlib/test_threaded_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py
index c6b6db6fa700e3f..8dbe1d860741fa9 100644
--- a/Lib/test/test_importlib/test_threaded_import.py
+++ b/Lib/test/test_importlib/test_threaded_import.py
@@ -178,11 +178,11 @@ def test_import_hangers(self):
         # In case this test is run again, make sure the helper module
         # gets loaded from scratch again.
         try:
-            del sys.modules['test.threaded_import_hangers']
+            del sys.modules['test.test_importlib.threaded_import_hangers']
         except KeyError:
             pass
         import test.test_importlib.threaded_import_hangers
-        self.assertFalse(test.threaded_import_hangers.errors)
+        self.assertFalse(test.test_importlib.threaded_import_hangers.errors)
 
     def test_circular_imports(self):
         # The goal of this test is to exercise implementations of the import

From 37f459e23f43629bf24415ad75b1ad7d9f816903 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 20:37:19 -0400
Subject: [PATCH 5/7] Update reference to threaded_import_hangers.py

Since the location of threaded_import_hangers.py was modified as part of issue 19696, the reference to it needs to be updated.
---
 PCbuild/lib.pyproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index 683335e044894db..f68ed358daeba70 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -1396,7 +1396,7 @@
     <Compile Include="test\test___all__.py" />
     <Compile Include="test\test___future__.py" />
     <Compile Include="test\tf_inherit_check.py" />
-    <Compile Include="test\threaded_import_hangers.py" />
+    <Compile Include="test\test_importlib\threaded_import_hangers.py" />
     <Compile Include="test\time_hashlib.py" />
     <Compile Include="test\tracedmodules\testmod.py" />
     <Compile Include="test\tracedmodules\__init__.py" />

From 6ace1140ff317b13ea112cc52ea4b8d2dd8f8353 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 20:40:05 -0400
Subject: [PATCH 6/7] Update reference to test_threaded_import.py

Since the location of test_threaded_import.py was modified in issue 19696, the reference to it needs to be updated.
---
 PCbuild/lib.pyproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index f68ed358daeba70..4b6122d748c924e 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -1306,7 +1306,7 @@
     <Compile Include="test\test_textwrap.py" />
     <Compile Include="test\test_thread.py" />
     <Compile Include="test\test_threadedtempfile.py" />
-    <Compile Include="test\test_threaded_import.py" />
+    <Compile Include="test\test_importlib\test_threaded_import.py" />
     <Compile Include="test\test_threading.py" />
     <Compile Include="test\test_threading_local.py" />
     <Compile Include="test\test_threadsignals.py" />

From cf5e6777c44c7fefd24bdb69d4fc8724e13ed9c8 Mon Sep 17 00:00:00 2001
From: Kyle Stanley <aeros167@gmail.com>
Date: Mon, 1 Jul 2019 20:42:56 -0400
Subject: [PATCH 7/7] Updated reference to test_pkgimport.py

Since the location of test_pkgimport.py was changed and the file was renamed to test_import_pkg.py, the reference to it should be updated. This did not cause any issues in merge which moved the file, but it should updated anyways.
---
 PCbuild/lib.pyproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index 4b6122d748c924e..8ddf42a1dfd23f9 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -1211,7 +1211,7 @@
     <Compile Include="test\test_pickletools.py" />
     <Compile Include="test\test_pipes.py" />
     <Compile Include="test\test_pkg.py" />
-    <Compile Include="test\test_pkgimport.py" />
+    <Compile Include="test\test_importlib\test_pkg_import.py" />
     <Compile Include="test\test_pkgutil.py" />
     <Compile Include="test\test_platform.py" />
     <Compile Include="test\test_plistlib.py" />