summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-04-25 02:03:46 (GMT)
committerBrett Cannon <brett@python.org>2012-04-25 02:03:46 (GMT)
commit8923a4d4c514a621b7f99ee0f3ebdde319aee0e9 (patch)
treee5e59afdd9843282a57a127398cf8eb04ee57fe2
parent4fe29c9657d64e8e3301122c104b7ca8fd23c348 (diff)
downloadcpython-8923a4d4c514a621b7f99ee0f3ebdde319aee0e9.zip
cpython-8923a4d4c514a621b7f99ee0f3ebdde319aee0e9.tar.gz
cpython-8923a4d4c514a621b7f99ee0f3ebdde319aee0e9.tar.bz2
Issue #14605: Insert to the front of sys.path_hooks instead of appending.
-rw-r--r--Lib/test/test_importhooks.py4
-rw-r--r--Lib/test/test_threaded_import.py2
-rw-r--r--Python/import.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_importhooks.py b/Lib/test/test_importhooks.py
index 7a25657..2a22d1a 100644
--- a/Lib/test/test_importhooks.py
+++ b/Lib/test/test_importhooks.py
@@ -215,7 +215,7 @@ class ImportHooksTestCase(ImportHooksBaseTestCase):
self.doTestImports(i)
def testPathHook(self):
- sys.path_hooks.append(PathImporter)
+ sys.path_hooks.insert(0, PathImporter)
sys.path.append(test_path)
self.doTestImports()
@@ -228,7 +228,7 @@ class ImportHooksTestCase(ImportHooksBaseTestCase):
def testImpWrapper(self):
i = ImpWrapper()
sys.meta_path.append(i)
- sys.path_hooks.append(ImpWrapper)
+ sys.path_hooks.insert(0, ImpWrapper)
mnames = (
"colorsys", "urllib.parse", "distutils.core", "sys",
)
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index 789920b..3faa184 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -145,7 +145,7 @@ class ThreadedImportTests(unittest.TestCase):
def path_hook(path):
finder.find_module('')
raise ImportError
- sys.path_hooks.append(path_hook)
+ sys.path_hooks.insert(0, path_hook)
sys.meta_path.append(flushing_finder)
try:
# Flush the cache a first time
diff --git a/Python/import.c b/Python/import.c
index ab320e5..8cf10e6 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -268,8 +268,8 @@ _PyImportZip_Init(void)
"# can't import zipimport.zipimporter\n");
}
else {
- /* sys.path_hooks.append(zipimporter) */
- err = PyList_Append(path_hooks, zipimporter);
+ /* sys.path_hooks.insert(0, zipimporter) */
+ err = PyList_Insert(path_hooks, 0, zipimporter);
Py_DECREF(zipimporter);
if (err < 0) {
goto error;