commit 5a5d6a10333af38c753b82f8d1bef14906c12b61
author Brett Cannon <brett@python.org> Wed Apr 25 20:18:24 2012 -0400
committer Brett Cannon <brett@python.org> Wed Apr 25 20:18:24 2012 -0400
tree 9bc3c6d28e29f08646775fec90e8b5000a633f02
parent 8923a4d4c514a621b7f99ee0f3ebdde319aee0e9
parent 718fbf078cef405318dc712a2c32fbc12e87de02

Merge

Lib/test/test_importhooks.py

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 @@
         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 @@
     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",
         )

Lib/test/test_threaded_import.py

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 @@
         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

Python/import.c

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 @@
                     "# 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;