[pypy-svn] r58314 - pypy/branch/2.5-features/pypy/interpreter

[fijal at codespeak.net]

Author: fijal
Date: Mon Sep 22 12:57:44 2008
New Revision: 58314

Modified:
   pypy/branch/2.5-features/pypy/interpreter/pyopcode.py
Log:
This seems to be needed (and is present on dist). Makes StdObjSpace
work again on top of cpy 2.4


Modified: pypy/branch/2.5-features/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/branch/2.5-features/pypy/interpreter/pyopcode.py	(original)
+++ pypy/branch/2.5-features/pypy/interpreter/pyopcode.py	Mon Sep 22 12:57:44 2008
@@ -740,8 +740,13 @@
             w_locals = space.w_None
         w_modulename = space.wrap(modulename)
         w_globals = f.w_globals
-        w_obj = space.call_function(w_import, w_modulename, w_globals,
-                                    w_locals, w_fromlist, w_flag)
+        if w_flag is None:
+            w_obj = space.call_function(w_import, w_modulename, w_globals,
+                                        w_locals, w_fromlist)
+        else:
+            w_obj = space.call_function(w_import, w_modulename, w_globals,
+                                        w_locals, w_fromlist, w_flag)
+
         f.pushvalue(w_obj)
 
     def IMPORT_STAR(f, *ignored):