[pypy-svn] pypy fast-forward: Fix test_interpreter.py after a bad merge

amauryfa commits-noreply at bitbucket.org
Tue Dec 28 01:22:24 CET 2010


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: fast-forward
Changeset: r40247:902cb7474321
Date: 2010-12-28 01:26 +0100
http://bitbucket.org/pypy/pypy/changeset/902cb7474321/

Log:	Fix test_interpreter.py after a bad merge

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -786,6 +786,12 @@
         w_fromlist = self.popvalue()
 
         w_flag = self.popvalue()
+        try:
+            if space.int_w(w_flag) == -1:
+                w_flag = None
+        except OperationError, e:
+            if e.async(space):
+                raise
 
         w_import = self.get_builtin().getdictvalue(space, '__import__')
         if w_import is None:


More information about the Pypy-commit mailing list