[pypy-svn] r48381 - pypy/branch/clr-module-improvements/pypy/module/__builtin__

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Nov  8 00:35:15 2007
New Revision: 48381

Modified:
   pypy/branch/clr-module-improvements/pypy/module/__builtin__/__init__.py
Log:
only install the zipimport hook when the zipimport module is requested


Modified: pypy/branch/clr-module-improvements/pypy/module/__builtin__/__init__.py
==============================================================================
--- pypy/branch/clr-module-improvements/pypy/module/__builtin__/__init__.py	(original)
+++ pypy/branch/clr-module-improvements/pypy/module/__builtin__/__init__.py	Thu Nov  8 00:35:15 2007
@@ -168,15 +168,11 @@
                 del self.loaders[name]
 
     def startup(self, space):
-        # install zipimport hook
-        try:
+        # install zipimport hook if --withmod-zipimport is used
+        if space.config.objspace.usemodules.zipimport:
             w_import = space.builtin.get('__import__')
             w_zipimport = space.call(w_import, space.newlist(
                 [space.wrap('zipimport')]))
-        except OperationError, e:
-            if not e.match(space, space.w_ImportError):
-                raise
-        else:
             w_sys = space.getbuiltinmodule('sys')
             w_path_hooks = space.getattr(w_sys, space.wrap('path_hooks'))
             w_append = space.getattr(w_path_hooks, space.wrap('append'))