From: Kyle Stanley <aeros167@gmail.com>
Date: Fri, 12 Jul 2019 21:22:05 +0000 (-0400)
Subject: bpo-19696: Move threaded_import_hangers (GH-14655)
X-Git-Tag: v3.9.0a1~1047
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a65c977552507dd19d2cc073fc91ae22cc66bbff;p=thirdparty%2FPython%2Fcpython.git

bpo-19696: Move threaded_import_hangers (GH-14655)



Move `threaded_import_hangers`, a dependency of `test_threaded_import`, to the directory `test_importlib/`. Also update the import references for `threaded_import_hangers` in `test_threaded_import`.





https://bugs.python.org/issue19696
---

diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py
index 8607f363db21..d1f64c70fac8 100644
--- a/Lib/test/test_importlib/test_threaded_import.py
+++ b/Lib/test/test_importlib/test_threaded_import.py
@@ -178,11 +178,11 @@ class ThreadedImportTests(unittest.TestCase):
         # 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.threaded_import_hangers
-        self.assertFalse(test.threaded_import_hangers.errors)
+        import test.test_importlib.threaded_import_hangers
+        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
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