From 8923a4d4c514a621b7f99ee0f3ebdde319aee0e9 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 24 Apr 2012 22:03:46 -0400 Subject: Issue #14605: Insert to the front of sys.path_hooks instead of appending. --- Lib/test/test_importhooks.py | 4 ++-- Lib/test/test_threaded_import.py | 2 +- Python/import.c | 4 ++-- 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; -- cgit v0.12