From bac27fb09ec9aa73e7a7231a1160126a1c129f35 Mon Sep 17 00:00:00 2001 From: Kyle Stanley Date: Mon, 8 Jul 2019 23:24:13 -0400 Subject: [PATCH 1/2] Move threaded_import_hangers to test_importlib/ --- 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 32d1f4d38b9d6c2c904574fd9d34a1db660948d0 Mon Sep 17 00:00:00 2001 From: Kyle Stanley Date: Mon, 8 Jul 2019 23:28:26 -0400 Subject: [PATCH 2/2] Update references to threaded_import_hangers Due to `threaded_import_hangers` being moved to `test_importlib/`, the references must be updated. --- Lib/test/test_importlib/test_threaded_import.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py index 8607f363db21c0..d1f64c70fac80f 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.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