Use the path to the imported item as __file__, not the package path

groves · groves · commit e0c0f60604fc · 2009-01-07T18:12:46.000Z
diff --git a/Lib/test/test_classpathimporter.py b/Lib/test/test_classpathimporter.py
@@ -18,22 +18,24 @@ def tearDown(self):
         except KeyError:
             pass
 
-    def setClassLoaderAndCheck(self, jar):
+    def setClassLoaderAndCheck(self, jar, prefix):
         Thread.currentThread().contextClassLoader = test_support.make_jar_classloader(jar)
         import flat_in_jar
         self.assertEquals(flat_in_jar.value, 7)
         import jar_pkg
+        self.assertEquals(prefix + '/jar_pkg/__init__$py.class', jar_pkg.__file__)
         from jar_pkg import prefer_compiled
+        self.assertEquals(prefix + '/jar_pkg/prefer_compiled$py.class', prefer_compiled.__file__)
         self.assert_(prefer_compiled.compiled)
         self.assertRaises(NameError, __import__, 'flat_bad')
         self.assertRaises(NameError, __import__, 'jar_pkg.bad')
 
     def test_default_pyclasspath(self):
-        self.setClassLoaderAndCheck("classimport.jar")
+        self.setClassLoaderAndCheck("classimport.jar", "__pyclasspath__")
 
     def test_path_in_pyclasspath(self):
         sys.path = ['__pyclasspath__/Lib']
-        self.setClassLoaderAndCheck("classimport_Lib.jar")
+        self.setClassLoaderAndCheck("classimport_Lib.jar", "__pyclasspath__/Lib")
 
 def test_main():
     test_support.run_unittest(ClasspathImporterTestCase)
diff --git a/src/org/python/core/ClasspathPyImporter.java b/src/org/python/core/ClasspathPyImporter.java
@@ -109,6 +109,11 @@ protected String makeFilename(String fullname) {
         return path.replace(PYCLASSPATH_PREFIX, "") + fullname.replace('.', '/');
     }
 
+    @Override
+    protected String makeFilePath(String fullname) {
+        return path + fullname.replace('.', '/');
+    }
+
     @Override
     protected String makePackagePath(String fullname) {
         return path;
diff --git a/src/org/python/core/util/importer.java b/src/org/python/core/util/importer.java
@@ -54,6 +54,12 @@ public importer() {
      */
     protected abstract String makeFilename(String fullname);
 
+    /**
+     * Given a full module name, return the potential file path including the archive (without
+     * extension).
+     */
+    protected abstract String makeFilePath(String fullname);
+
     /**
      * Returns an entry for a filename from makeFilename with a potential suffix such that this
      * importer can make a bundle with it, or null if fullFilename doesn't exist in this importer.
@@ -156,7 +162,7 @@ protected final ModuleInfo getModuleInfo(String fullname) {
      */
     protected final ModuleCodeData getModuleCode(String fullname) {
         String path = makeFilename(fullname);
-        String fullPath = makePackagePath(fullname);
+        String fullPath = makeFilePath(fullname);
 
         if (path.length() < 0) {
             return null;
@@ -186,7 +192,7 @@ protected final ModuleCodeData getModuleCode(String fullname) {
                 try {
                     codeBytes = imp.readCode(fullname, bundle.inputStream, true);
                 } catch (IOException ioe) {
-                    throw Py.ImportError(ioe.getMessage() + "[path=" + fullPath + searchPath + "]");
+                    throw Py.ImportError(ioe.getMessage() + "[path=" + fullSearchPath + "]");
                 }
             } else {
                 codeBytes = imp.compileSource(fullname, bundle.inputStream, fullSearchPath);
diff --git a/src/org/python/modules/zipimport/zipimporter.java b/src/org/python/modules/zipimport/zipimporter.java
@@ -422,6 +422,11 @@ protected String makePackagePath(String fullname) {
         return archive + File.separator + prefix + getSubname(fullname);
     }
 
+    @Override
+    protected String makeFilePath(String fullname) {
+        return makePackagePath(fullname);
+    }
+
     @Override
     protected PyObject makeEntry(String fullFilename) {
         return files.__finditem__(fullFilename);
