[pypy-svn] r64413 - pypy/release/1.1.x/pypy/module/zipimport

[pedronis at codespeak.net]

Author: pedronis
Date: Sun Apr 19 22:13:07 2009
New Revision: 64413

Modified:
   pypy/release/1.1.x/pypy/module/zipimport/interp_zipimport.py
Log:
reverting this on the release branch to be super-safe, it will be back on the final release if all goes well

Modified: pypy/release/1.1.x/pypy/module/zipimport/interp_zipimport.py
==============================================================================
--- pypy/release/1.1.x/pypy/module/zipimport/interp_zipimport.py	(original)
+++ pypy/release/1.1.x/pypy/module/zipimport/interp_zipimport.py	Sun Apr 19 22:13:07 2009
@@ -137,16 +137,10 @@
             filename = filename.replace(os.path.sep, ZIPSEP)
         return filename
 
-    def corr_zname(self, fname):
-        if ZIPSEP != os.path.sep:
-            return fname.replace(ZIPSEP, os.path.sep)
-        else:
-            return fname
-
     def import_py_file(self, space, modname, filename, buf, pkgpath):
         w = space.wrap
         w_mod = w(Module(space, w(modname)))
-        real_name = self.name + os.path.sep + self.corr_zname(filename)
+        real_name = self.name + os.path.sep + filename
         space.setattr(w_mod, w('__loader__'), space.wrap(self))
         importing._prepare_module(space, w_mod, real_name, pkgpath)
         result = importing.load_source_module(space, w(modname), w_mod,
@@ -193,7 +187,7 @@
                                        pkgpath)
         buf = buf[8:] # XXX ugly copy, should use sequential read instead
         w_mod = w(Module(space, w(modname)))
-        real_name = self.name + os.path.sep + self.corr_zname(filename)
+        real_name = self.name + os.path.sep + filename
         space.setattr(w_mod, w('__loader__'), space.wrap(self))
         importing._prepare_module(space, w_mod, real_name, pkgpath)
         result = importing.load_compiled_module(space, w(modname), w_mod,