Good catch Neal!

I completely forgot about pyo files and the tests are usually not run with -O. The modified code checks for *.py?

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index d8f2d51b206b0a2b7f10c97eebd8bfb0a0bce0df..6eac67e9900e4f3feb594ee38efc1487c1e20bd7 100644 (file)
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -213,7 +213,8 @@ class ImportTest(unittest.TestCase):
             os.remove(source)
             del sys.modules[TESTFN]
             mod = __import__(TESTFN)
-            self.failUnless(mod.__file__.endswith('.pyc'))
+            ext = mod.__file__[-4:]
+            self.failUnless(ext in ('.pyc', '.pyo'), ext)
         finally:
             sys.path.pop(0)
             remove_files(TESTFN)

diff --git a/Python/import.c b/Python/import.c
index f9d4246a2bddfc84951b77ba7fcb4cdaa1ff0f4e..cce854fc7c2a71731bbedbe1bfdfd62acd59fc38 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -982,7 +982,8 @@ get_sourcefile(const char *file)
        }
 
        len = strlen(file);
-       if (len > MAXPATHLEN || PyOS_stricmp(&file[len-4], ".pyc") != 0) {
+        /* match '*.py?' */
+       if (len > MAXPATHLEN || PyOS_strnicmp(&file[len-4], ".py", 3) != 0) {
                return PyUnicode_DecodeFSDefault(file);
        }