[pypy-svn] r75384 - pypy/trunk/pypy/module/zipimport

[fijal at codespeak.net]

Author: fijal
Date: Mon Jun 14 07:18:01 2010
New Revision: 75384

Modified:
   pypy/trunk/pypy/module/zipimport/interp_zipimport.py
Log:
Eh, another try to fix it. Also strike redundant if


Modified: pypy/trunk/pypy/module/zipimport/interp_zipimport.py
==============================================================================
--- pypy/trunk/pypy/module/zipimport/interp_zipimport.py	(original)
+++ pypy/trunk/pypy/module/zipimport/interp_zipimport.py	Mon Jun 14 07:18:01 2010
@@ -357,7 +357,7 @@
     prefix = name[len(filename):]
     if prefix.startswith(os.path.sep) or prefix.startswith(ZIPSEP):
         prefix = prefix[1:]
-    if prefix and len(name) != len(filename):
+    if prefix and not prefix.endswith(ZIPSEP):
         prefix += ZIPSEP
     w_result = space.wrap(W_ZipImporter(space, name, filename,
                                         zip_file.NameToInfo, prefix))