summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Stanley <aeros167@gmail.com>2019-07-12 21:22:05 (GMT)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-07-12 21:22:05 (GMT)
commita65c977552507dd19d2cc073fc91ae22cc66bbff (patch)
treea34a6b622225274236cc79489421c8d10040d9c6
parentc8e7146de257930ea8d0d4aa74b3a64fcaa79d4b (diff)
downloadcpython-a65c977552507dd19d2cc073fc91ae22cc66bbff.zip
cpython-a65c977552507dd19d2cc073fc91ae22cc66bbff.tar.gz
cpython-a65c977552507dd19d2cc073fc91ae22cc66bbff.tar.bz2
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
-rw-r--r--Lib/test/test_importlib/test_threaded_import.py6
-rw-r--r--Lib/test/test_importlib/threaded_import_hangers.py (renamed from Lib/test/threaded_import_hangers.py)0
2 files 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 8607f36..d1f64c7 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
index 5484e60..5484e60 100644
--- a/Lib/test/threaded_import_hangers.py
+++ b/Lib/test/test_importlib/threaded_import_hangers.py