[pypy-svn] r72919 - pypy/branch/fix-win/pypy/module/zipimport

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar 26 19:03:38 2010
New Revision: 72919

Modified:
   pypy/branch/fix-win/pypy/module/zipimport/interp_zipimport.py
Log:
Fix.


Modified: pypy/branch/fix-win/pypy/module/zipimport/interp_zipimport.py
==============================================================================
--- pypy/branch/fix-win/pypy/module/zipimport/interp_zipimport.py	(original)
+++ pypy/branch/fix-win/pypy/module/zipimport/interp_zipimport.py	Fri Mar 26 19:03:38 2010
@@ -131,7 +131,7 @@
     def _find_relative_path(self, filename):
         if filename.startswith(self.filename):
             filename = filename[len(self.filename):]
-        if filename.startswith(os.sep):
+        if filename.startswith(os.path.sep) or filename.startswith(ZIPSEP):
             filename = filename[1:]
         if ZIPSEP != os.path.sep:
             filename = filename.replace(os.path.sep, ZIPSEP)
@@ -361,7 +361,7 @@
             "%s seems not to be a zipfile", filename)
     zip_file.close()
     prefix = name[len(filename):]
-    if prefix.startswith(os.sep):
+    if prefix.startswith(os.path.sep) or prefix.startswith(ZIPSEP):
         prefix = prefix[1:]
     w_result = space.wrap(W_ZipImporter(space, name, filename,
                                         zip_file.NameToInfo, prefix))