[pypy-svn] r10371 - pypy/branch/pypy-normalize-exception/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Wed Apr  6 20:12:46 2005
New Revision: 10371

Modified:
   pypy/branch/pypy-normalize-exception/interpreter/pyframe.py
Log:
This seems to make more sense...


Modified: pypy/branch/pypy-normalize-exception/interpreter/pyframe.py
==============================================================================
--- pypy/branch/pypy-normalize-exception/interpreter/pyframe.py	(original)
+++ pypy/branch/pypy-normalize-exception/interpreter/pyframe.py	Wed Apr  6 20:12:46 2005
@@ -395,12 +395,12 @@
             # push the exception to the value stack for inspection by the
             # exception handler (the code after the except:)
             operationerr = unroller.args[0]
-            try:
-                operationerr.normalize_exception(frame.space)
-            except OperationError, operationerr:
-                # exception while normalizing the exception!
-                # you get an exception, just not the one you might expect...
-                if frame.space.full_exceptions:
+            if frame.space.full_exceptions:
+                try:
+                    operationerr.normalize_exception(frame.space)
+                except OperationError, operationerr:
+                    # exception while normalizing the exception!
+                    # you get an exception, just not the one you might expect...
                     operationerr.normalize_exception(frame.space)
             # the stack setup is slightly different than in CPython:
             # instead of the traceback, we store the unroller object,