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

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar 26 16:03:19 2010
New Revision: 72902

Modified:
   pypy/trunk/pypy/module/zipimport/interp_zipimport.py
Log:
Fix for Windows.


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	Fri Mar 26 16:03:19 2010
@@ -326,10 +326,12 @@
     w_ZipImportError = space.getattr(space.getbuiltinmodule('zipimport'),
                                      w('ZipImportError'))
     ok = False
-    parts = name.split(os.path.sep)
+    parts_ends = [i for i in range(0, len(name))
+                    if name[i] == os.path.sep or name[i] == ZIPSEP]
+    parts_ends.append(len(name))
     filename = "" # make annotator happy
-    for i in range(1, len(parts) + 1):
-        filename = os.path.sep.join(parts[:i])
+    for i in parts_ends:
+        filename = name[:i]
         if not filename:
             filename = os.path.sep
         try: